content: Update include paths of string_split.h to its new location.

content: Update include paths of string_split.h to its new location.

BUG=175186
[email protected]


Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=182842

[tfarina, 2013-02-15 18:23:52]

Here we go.

TBRing...

[commit-bot: I haz the power, 2013-02-15 18:24:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/12287004/1

[commit-bot: I haz the power, 2013-02-15 18:24:19]

Failed to apply patch for content/renderer/render_view_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/renderer/render_view_impl.cc
  Hunk #1 succeeded at 23 (offset 1 line).
  Hunk #2 succeeded at 74 (offset 2 lines).
  Hunk #3 succeeded at 126 (offset 2 lines).
  Hunk #4 succeeded at 142 (offset 2 lines).
  Hunk #5 FAILED at 181.
  1 out of 5 hunks FAILED -- saving rejects to file
content/renderer/render_view_impl.cc.rej

Patch:       content/renderer/render_view_impl.cc
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc
b/content/renderer/render_view_impl.cc
index
8dde7b7da823272dab6b3713f96a58f10274d5a8..9ba5c41ecf3d875b364f9dd6b08824682bf24aae
100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -22,8 +22,8 @@
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
-#include "base/string_split.h"
 #include "base/string_util.h"
+#include "base/strings/string_split.h"
 #include "base/sys_string_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ -72,15 +72,15 @@
 #include "content/renderer/device_orientation_dispatcher.h"
 #include "content/renderer/devtools/devtools_agent.h"
 #include "content/renderer/disambiguation_popup_helper.h"
+#include "content/renderer/do_not_track_bindings.h"
 #include "content/renderer/dom_automation_controller.h"
 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
-#include "content/renderer/do_not_track_bindings.h"
 #include "content/renderer/external_popup_menu.h"
 #include "content/renderer/favicon_helper.h"
 #include "content/renderer/geolocation_dispatcher.h"
-#include "content/renderer/gpu/compositor_thread.h"
 #include "content/renderer/gpu/compositor_output_surface.h"
 #include "content/renderer/gpu/compositor_software_output_device_gl_adapter.h"
+#include "content/renderer/gpu/compositor_thread.h"
 #include "content/renderer/gpu/render_widget_compositor.h"
 #include "content/renderer/idle_user_detector.h"
 #include "content/renderer/input_tag_speech_dispatcher.h"
@@ -124,6 +124,7 @@
 #include "net/base/net_errors.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/http/http_util.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebDragData.h"
 #include
"third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
@@ -139,14 +140,15 @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
+#include
"third_party/WebKit/Source/WebKit/chromium/public/default/WebRenderTheme.h"
 #include
"third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebColorName.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMEvent.h"
-#include
"third_party/WebKit/Source/WebKit/chromium/public/WebDOMMessageEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
 #include
"third_party/WebKit/Source/WebKit/chromium/public/WebDateTimeChooserCompletion.h"
 #include
"third_party/WebKit/Source/WebKit/chromium/public/WebDateTimeChooserParams.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMEvent.h"
+#include
"third_party/WebKit/Source/WebKit/chromium/public/WebDOMMessageEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include
"third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.h"
 #include
"third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
@@ -179,8 +181,6 @@
 #include
"third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h"
-#include
"third_party/WebKit/Source/WebKit/chromium/public/default/WebRenderTheme.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"

[commit-bot: I haz the power, 2013-02-15 18:35:35]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/12287004/4001

[brettw, 2013-02-15 19:14:21]

lgtm

[commit-bot: I haz the power, 2013-02-15 21:55:51]

Change committed as 182842