summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/browser/download/save_package.cc2
-rw-r--r--content/browser/gamepad/gamepad_standard_mappings.h2
-rw-r--r--content/browser/host_zoom_map_impl.cc6
-rw-r--r--content/browser/renderer_host/media/web_contents_capture_util.cc2
-rw-r--r--content/browser/ssl/ssl_policy.cc2
-rw-r--r--content/common/sandbox_mac.mm2
-rw-r--r--content/gpu/gpu_info_collector.cc2
-rw-r--r--content/gpu/gpu_info_collector_android.cc2
-rw-r--r--content/gpu/gpu_info_collector_linux.cc2
-rw-r--r--content/gpu/gpu_info_collector_mac.mm2
-rw-r--r--content/public/common/content_client.cc2
-rw-r--r--content/public/common/content_client.h2
-rw-r--r--content/renderer/render_view_impl.cc2
-rw-r--r--content/shell/shell.h4
-rw-r--r--content/shell/shell_android.cc4
-rw-r--r--content/shell/shell_content_client.cc2
-rw-r--r--content/shell/shell_gtk.cc2
-rw-r--r--content/shell/shell_mac.mm2
-rw-r--r--content/test/test_content_client.cc2
19 files changed, 23 insertions, 23 deletions
diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc
index f97d2d6..d27bdc1 100644
--- a/content/browser/download/save_package.cc
+++ b/content/browser/download/save_package.cc
@@ -13,7 +13,7 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/stl_util.h"
-#include "base/string_piece.h"
+#include "base/strings/string_piece.h"
#include "base/strings/string_split.h"
#include "base/strings/sys_string_conversions.h"
#include "base/threading/thread.h"
diff --git a/content/browser/gamepad/gamepad_standard_mappings.h b/content/browser/gamepad/gamepad_standard_mappings.h
index 35b01f8..6f5d72f 100644
--- a/content/browser/gamepad/gamepad_standard_mappings.h
+++ b/content/browser/gamepad/gamepad_standard_mappings.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_BROWSER_GAMEPAD_GAMEPAD_STANDARD_MAPPINGS_H_
#define CONTENT_BROWSER_GAMEPAD_GAMEPAD_STANDARD_MAPPINGS_H_
-#include "base/string_piece.h"
+#include "base/strings/string_piece.h"
namespace WebKit {
class WebGamepad;
diff --git a/content/browser/host_zoom_map_impl.cc b/content/browser/host_zoom_map_impl.cc
index a60a923..ad70977 100644
--- a/content/browser/host_zoom_map_impl.cc
+++ b/content/browser/host_zoom_map_impl.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <cmath>
-
#include "content/browser/host_zoom_map_impl.h"
-#include "base/string_piece.h"
+#include <cmath>
+
+#include "base/strings/string_piece.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "content/browser/renderer_host/render_process_host_impl.h"
diff --git a/content/browser/renderer_host/media/web_contents_capture_util.cc b/content/browser/renderer_host/media/web_contents_capture_util.cc
index 46b7376..843a8e5 100644
--- a/content/browser/renderer_host/media/web_contents_capture_util.cc
+++ b/content/browser/renderer_host/media/web_contents_capture_util.cc
@@ -6,8 +6,8 @@
#include "base/basictypes.h"
#include "base/string_number_conversions.h"
-#include "base/string_piece.h"
#include "base/string_util.h"
+#include "base/strings/string_piece.h"
namespace {
diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc
index 750bf47..1b0e424 100644
--- a/content/browser/ssl/ssl_policy.cc
+++ b/content/browser/ssl/ssl_policy.cc
@@ -8,8 +8,8 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/memory/singleton.h"
-#include "base/string_piece.h"
#include "base/string_util.h"
+#include "base/strings/string_piece.h"
#include "content/browser/renderer_host/render_process_host_impl.h"
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/site_instance_impl.h"
diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm
index f864ff9..8265ff1 100644
--- a/content/common/sandbox_mac.mm
+++ b/content/common/sandbox_mac.mm
@@ -23,9 +23,9 @@ extern "C" {
#include "base/memory/scoped_nsobject.h"
#include "base/rand_util.h"
#include "base/string16.h"
-#include "base/string_piece.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
+#include "base/strings/string_piece.h"
#include "base/strings/sys_string_conversions.h"
#include "base/sys_info.h"
#include "base/utf_string_conversions.h"
diff --git a/content/gpu/gpu_info_collector.cc b/content/gpu/gpu_info_collector.cc
index d3f5867..61d5c4a 100644
--- a/content/gpu/gpu_info_collector.cc
+++ b/content/gpu/gpu_info_collector.cc
@@ -10,7 +10,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/string_number_conversions.h"
-#include "base/string_piece.h"
+#include "base/strings/string_piece.h"
#include "base/strings/string_split.h"
#include "ui/gl/gl_bindings.h"
#include "ui/gl/gl_context.h"
diff --git a/content/gpu/gpu_info_collector_android.cc b/content/gpu/gpu_info_collector_android.cc
index 9255c52..3197414 100644
--- a/content/gpu/gpu_info_collector_android.cc
+++ b/content/gpu/gpu_info_collector_android.cc
@@ -8,8 +8,8 @@
#include "base/command_line.h"
#include "base/logging.h"
#include "base/string_number_conversions.h"
-#include "base/string_piece.h"
#include "base/string_util.h"
+#include "base/strings/string_piece.h"
#include "base/strings/string_split.h"
#include "cc/base/switches.h"
#include "content/public/common/content_switches.h"
diff --git a/content/gpu/gpu_info_collector_linux.cc b/content/gpu/gpu_info_collector_linux.cc
index 23cfad3..2d43167 100644
--- a/content/gpu/gpu_info_collector_linux.cc
+++ b/content/gpu/gpu_info_collector_linux.cc
@@ -13,8 +13,8 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "base/string_piece.h"
#include "base/string_util.h"
+#include "base/strings/string_piece.h"
#include "base/strings/string_split.h"
#include "base/strings/string_tokenizer.h"
#include "library_loaders/libpci.h"
diff --git a/content/gpu/gpu_info_collector_mac.mm b/content/gpu/gpu_info_collector_mac.mm
index 74de2c9..b3ded51 100644
--- a/content/gpu/gpu_info_collector_mac.mm
+++ b/content/gpu/gpu_info_collector_mac.mm
@@ -12,8 +12,8 @@
#include "base/mac/scoped_cftyperef.h"
#include "base/memory/scoped_ptr.h"
#include "base/string_number_conversions.h"
-#include "base/string_piece.h"
#include "base/string_util.h"
+#include "base/strings/string_piece.h"
#include "base/strings/sys_string_conversions.h"
#include "ui/gl/gl_bindings.h"
#include "ui/gl/gl_context.h"
diff --git a/content/public/common/content_client.cc b/content/public/common/content_client.cc
index 06f31a4..96cf48c 100644
--- a/content/public/common/content_client.cc
+++ b/content/public/common/content_client.cc
@@ -5,7 +5,7 @@
#include "content/public/common/content_client.h"
#include "base/logging.h"
-#include "base/string_piece.h"
+#include "base/strings/string_piece.h"
#include "ui/gfx/image/image.h"
#include "webkit/user_agent/user_agent.h"
diff --git a/content/public/common/content_client.h b/content/public/common/content_client.h
index f7d21c2..198ecad 100644
--- a/content/public/common/content_client.h
+++ b/content/public/common/content_client.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/string16.h"
-#include "base/string_piece.h"
+#include "base/strings/string_piece.h"
#include "build/build_config.h"
#include "content/common/content_export.h"
#include "ui/base/layout.h"
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 55c4770..9eeb619 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -22,8 +22,8 @@
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/string_number_conversions.h"
-#include "base/string_piece.h"
#include "base/string_util.h"
+#include "base/strings/string_piece.h"
#include "base/strings/string_split.h"
#include "base/strings/sys_string_conversions.h"
#include "base/time.h"
diff --git a/content/shell/shell.h b/content/shell/shell.h
index fb1c5c6..736bd3f 100644
--- a/content/shell/shell.h
+++ b/content/shell/shell.h
@@ -10,9 +10,9 @@
#include "base/basictypes.h"
#include "base/callback_forward.h"
#include "base/memory/scoped_ptr.h"
-#include "base/string_piece.h"
-#include "content/public/browser/notification_registrar.h"
+#include "base/strings/string_piece.h"
#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/web_contents_delegate.h"
#include "ipc/ipc_channel.h"
#include "ui/gfx/native_widget_types.h"
diff --git a/content/shell/shell_android.cc b/content/shell/shell_android.cc
index 32d7fc0..d8a6fcb 100644
--- a/content/shell/shell_android.cc
+++ b/content/shell/shell_android.cc
@@ -6,11 +6,11 @@
#include <jni.h>
-#include "base/android/scoped_java_ref.h"
#include "base/android/jni_string.h"
+#include "base/android/scoped_java_ref.h"
#include "base/command_line.h"
#include "base/logging.h"
-#include "base/string_piece.h"
+#include "base/strings/string_piece.h"
#include "content/public/common/content_switches.h"
#include "content/shell/android/shell_manager.h"
#include "jni/Shell_jni.h"
diff --git a/content/shell/shell_content_client.cc b/content/shell/shell_content_client.cc
index f96b6a3..a8f697a 100644
--- a/content/shell/shell_content_client.cc
+++ b/content/shell/shell_content_client.cc
@@ -5,7 +5,7 @@
#include "content/shell/shell_content_client.h"
#include "base/command_line.h"
-#include "base/string_piece.h"
+#include "base/strings/string_piece.h"
#include "base/utf_string_conversions.h"
#include "content/public/common/content_switches.h"
#include "content/shell/shell_switches.h"
diff --git a/content/shell/shell_gtk.cc b/content/shell/shell_gtk.cc
index b1ef588..98def95 100644
--- a/content/shell/shell_gtk.cc
+++ b/content/shell/shell_gtk.cc
@@ -8,7 +8,7 @@
#include <gtk/gtk.h>
#include "base/logging.h"
-#include "base/string_piece.h"
+#include "base/strings/string_piece.h"
#include "base/utf_string_conversions.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/native_web_keyboard_event.h"
diff --git a/content/shell/shell_mac.mm b/content/shell/shell_mac.mm
index 90b269d..0e1c582 100644
--- a/content/shell/shell_mac.mm
+++ b/content/shell/shell_mac.mm
@@ -8,7 +8,7 @@
#include "base/logging.h"
#import "base/memory/scoped_nsobject.h"
-#include "base/string_piece.h"
+#include "base/strings/string_piece.h"
#include "base/strings/sys_string_conversions.h"
#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/browser/web_contents.h"
diff --git a/content/test/test_content_client.cc b/content/test/test_content_client.cc
index fa09e9f..abd1aead 100644
--- a/content/test/test_content_client.cc
+++ b/content/test/test_content_client.cc
@@ -8,7 +8,7 @@
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/path_service.h"
-#include "base/string_piece.h"
+#include "base/strings/string_piece.h"
namespace content {