Use a direct include of strings headers in chrome/common/, part 2.

BUG=247723
TEST=none
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/16579006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205372 0039d316-1c4b-4281-b951-d872f2087c98

49 files changed, 61 insertions, 61 deletions

diff --git a/chrome/common/extensions/permissions/permission_message.h b/chrome/common/extensions/permissions/permission_message.h
index 92e5c63..da915c18 100644
--- a/chrome/common/extensions/permissions/permission_message.h
+++ b/chrome/common/extensions/permissions/permission_message.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace extensions {
 
diff --git a/chrome/common/extensions/permissions/permission_set.h b/chrome/common/extensions/permissions/permission_set.h
index b8fd3ad..3de9287 100644
--- a/chrome/common/extensions/permissions/permission_set.h
+++ b/chrome/common/extensions/permissions/permission_set.h
@@ -13,7 +13,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "chrome/common/extensions/manifest.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
 #include "chrome/common/extensions/permissions/api_permission_set.h"
diff --git a/chrome/common/extensions/permissions/permissions_data.cc b/chrome/common/extensions/permissions/permissions_data.cc
index 796bcdf..6ab4029 100644
--- a/chrome/common/extensions/permissions/permissions_data.cc
+++ b/chrome/common/extensions/permissions/permissions_data.cc
@@ -6,9 +6,9 @@
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
-#include "base/stringprintf.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/common/extensions/permissions/permissions_data.h b/chrome/common/extensions/permissions/permissions_data.h
index 1c31ae7..6c5e6d3 100644
--- a/chrome/common/extensions/permissions/permissions_data.h
+++ b/chrome/common/extensions/permissions/permissions_data.h
@@ -10,7 +10,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
 #include "chrome/common/extensions/permissions/permission_message.h"
diff --git a/chrome/common/extensions/permissions/permissions_data_unittest.cc b/chrome/common/extensions/permissions/permissions_data_unittest.cc
index 803aa1d..2fd87c5 100644
--- a/chrome/common/extensions/permissions/permissions_data_unittest.cc
+++ b/chrome/common/extensions/permissions/permissions_data_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
diff --git a/chrome/common/extensions/permissions/permissions_info.cc b/chrome/common/extensions/permissions/permissions_info.cc
index bea35d0..9ff6df9 100644
--- a/chrome/common/extensions/permissions/permissions_info.cc
+++ b/chrome/common/extensions/permissions/permissions_info.cc
@@ -7,7 +7,7 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "chrome/common/extensions/permissions/chrome_api_permissions.h"
 
 namespace extensions {
diff --git a/chrome/common/extensions/permissions/socket_permission_data.cc b/chrome/common/extensions/permissions/socket_permission_data.cc
index 316060a..24e6277 100644
--- a/chrome/common/extensions/permissions/socket_permission_data.cc
+++ b/chrome/common/extensions/permissions/socket_permission_data.cc
@@ -10,9 +10,9 @@
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
 #include "chrome/common/extensions/permissions/socket_permission.h"
 #include "googleurl/src/url_canon.h"
diff --git a/chrome/common/extensions/permissions/usb_device_permission.cc b/chrome/common/extensions/permissions/usb_device_permission.cc
index d18eee4..ef832c1 100644
--- a/chrome/common/extensions/permissions/usb_device_permission.cc
+++ b/chrome/common/extensions/permissions/usb_device_permission.cc
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/logging.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/extensions/permissions/permissions_info.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/common/extensions/unpacker.cc b/chrome/common/extensions/unpacker.cc
index eeceac5..bb450df 100644
--- a/chrome/common/extensions/unpacker.cc
+++ b/chrome/common/extensions/unpacker.cc
@@ -12,7 +12,7 @@
 #include "base/i18n/rtl.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/memory/scoped_handle.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
diff --git a/chrome/common/extensions/unpacker_unittest.cc b/chrome/common/extensions/unpacker_unittest.cc
index 3966f6c..61a09f74 100644
--- a/chrome/common/extensions/unpacker_unittest.cc
+++ b/chrome/common/extensions/unpacker_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/chrome_paths.h"
diff --git a/chrome/common/extensions/update_manifest.cc b/chrome/common/extensions/update_manifest.cc
index 5287fd2..feb6f70 100644
--- a/chrome/common/extensions/update_manifest.cc
+++ b/chrome/common/extensions/update_manifest.cc
@@ -8,9 +8,9 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/version.h"
 #include "libxml/tree.h"
 #include "third_party/libxml/chromium/libxml_utils.h"
diff --git a/chrome/common/extensions/user_script.cc b/chrome/common/extensions/user_script.cc
index ce497f6..467901f 100644
--- a/chrome/common/extensions/user_script.cc
+++ b/chrome/common/extensions/user_script.cc
@@ -6,7 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/pickle.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "chrome/common/chrome_switches.h"
 
 namespace {
diff --git a/chrome/common/extensions/value_builder.h b/chrome/common/extensions/value_builder.h
index 2ca7693..48e9133 100644
--- a/chrome/common/extensions/value_builder.h
+++ b/chrome/common/extensions/value_builder.h
@@ -36,7 +36,7 @@
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/values.h"
 
 namespace extensions {
diff --git a/chrome/common/instant_types.h b/chrome/common/instant_types.h
index 1df381c..3826075 100644
--- a/chrome/common/instant_types.h
+++ b/chrome/common/instant_types.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <utility>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "chrome/common/autocomplete_match_type.h"
 #include "content/public/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/common/json_schema/json_schema_validator.cc b/chrome/common/json_schema/json_schema_validator.cc
index 1c45b99..40e8b72 100644
--- a/chrome/common/json_schema/json_schema_validator.cc
+++ b/chrome/common/json_schema/json_schema_validator.cc
@@ -9,9 +9,9 @@
 #include <cmath>
 
 #include "base/json/json_reader.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/common/json_schema/json_schema_constants.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/common/json_schema/json_schema_validator_unittest_base.cc b/chrome/common/json_schema/json_schema_validator_unittest_base.cc
index 8ce82b7..50af16a8 100644
--- a/chrome/common/json_schema/json_schema_validator_unittest_base.cc
+++ b/chrome/common/json_schema/json_schema_validator_unittest_base.cc
@@ -13,7 +13,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/json_schema/json_schema_constants.h"
diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc
index 30eaa27e..bba0d69 100644
--- a/chrome/common/localized_error.cc
+++ b/chrome/common/localized_error.cc
@@ -6,9 +6,9 @@
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
-#include "base/string16.h"
-#include "base/string_util.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension_constants.h"
diff --git a/chrome/common/localized_error.h b/chrome/common/localized_error.h
index 69d1d27..3fb8b28 100644
--- a/chrome/common/localized_error.h
+++ b/chrome/common/localized_error.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 class GURL;
 
diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc
index e425bc1..cada54f 100644
--- a/chrome/common/logging_chrome.cc
+++ b/chrome/common/logging_chrome.cc
@@ -38,9 +38,9 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
diff --git a/chrome/common/mac/app_mode_chrome_locator.h b/chrome/common/mac/app_mode_chrome_locator.h
index e7da4c4..f5e7a3e 100644
--- a/chrome/common/mac/app_mode_chrome_locator.h
+++ b/chrome/common/mac/app_mode_chrome_locator.h
@@ -7,7 +7,7 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 @class NSString;
 
diff --git a/chrome/common/mac/app_mode_common.h b/chrome/common/mac/app_mode_common.h
index b9045a6..d397c4b 100644
--- a/chrome/common/mac/app_mode_common.h
+++ b/chrome/common/mac/app_mode_common.h
@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
 
 #include "base/files/file_path.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 // This file contains constants, interfaces, etc. which are common to the
 // browser application and the app mode loader (a.k.a. shim).
diff --git a/chrome/common/mac/launchd.mm b/chrome/common/mac/launchd.mm
index 6d14523..31dbba3 100644
--- a/chrome/common/mac/launchd.mm
+++ b/chrome/common/mac/launchd.mm
@@ -11,7 +11,7 @@
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/process_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "third_party/GTM/Foundation/GTMServiceManagement.h"
 
diff --git a/chrome/common/mac/mock_launchd.cc b/chrome/common/mac/mock_launchd.cc
index b7aca6c..bc08bf8 100644
--- a/chrome/common/mac/mock_launchd.cc
+++ b/chrome/common/mac/mock_launchd.cc
@@ -15,8 +15,8 @@
 #include "base/mac/scoped_cftyperef.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/mac/launchd.h"
diff --git a/chrome/common/mac/objc_zombie.mm b/chrome/common/mac/objc_zombie.mm
index b71cda7..8f64840 100644
--- a/chrome/common/mac/objc_zombie.mm
+++ b/chrome/common/mac/objc_zombie.mm
@@ -15,7 +15,7 @@
 #include "base/debug/stack_trace.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/synchronization/lock.h"
 #include "chrome/common/crash_keys.h"
 #import "chrome/common/mac/objc_method_swizzle.h"
diff --git a/chrome/common/metrics/metrics_log_base_unittest.cc b/chrome/common/metrics/metrics_log_base_unittest.cc
index 610c11ca..cd6b3bf 100644
--- a/chrome/common/metrics/metrics_log_base_unittest.cc
+++ b/chrome/common/metrics/metrics_log_base_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "base/base64.h"
 #include "base/format_macros.h"
-#include "base/stringprintf.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/time.h"
 #include "chrome/common/metrics/metrics_log_base.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/common/metrics/metrics_log_manager.cc b/chrome/common/metrics/metrics_log_manager.cc
index 198ed96..878e5ff 100644
--- a/chrome/common/metrics/metrics_log_manager.cc
+++ b/chrome/common/metrics/metrics_log_manager.cc
@@ -7,7 +7,7 @@
 #include <algorithm>
 
 #include "base/metrics/histogram.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "chrome/common/metrics/metrics_log_base.h"
 
 MetricsLogManager::MetricsLogManager()
diff --git a/chrome/common/metrics/variations/uniformity_field_trials.cc b/chrome/common/metrics/variations/uniformity_field_trials.cc
index 0f921a1..3032e17 100644
--- a/chrome/common/metrics/variations/uniformity_field_trials.cc
+++ b/chrome/common/metrics/variations/uniformity_field_trials.cc
@@ -5,7 +5,7 @@
 #include "chrome/common/metrics/variations/uniformity_field_trials.h"
 
 #include "base/metrics/field_trial.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/time.h"
 #include "chrome/common/metrics/variations/variations_util.h"
 
diff --git a/chrome/common/metrics/variations/variations_util.cc b/chrome/common/metrics/variations/variations_util.cc
index abb3528..6557f62 100644
--- a/chrome/common/metrics/variations/variations_util.cc
+++ b/chrome/common/metrics/variations/variations_util.cc
@@ -9,11 +9,11 @@
 
 #include "base/memory/singleton.h"
 #include "base/sha1.h"
-#include "base/string16.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_byteorder.h"
 #include "chrome/common/child_process_logging.h"
diff --git a/chrome/common/metrics/variations/variations_util.h b/chrome/common/metrics/variations/variations_util.h
index 31c58ad..244df09 100644
--- a/chrome/common/metrics/variations/variations_util.h
+++ b/chrome/common/metrics/variations/variations_util.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/metrics/field_trial.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "chrome/common/metrics/variations/variation_ids.h"
 
 // This namespace provides various helpers that extend the functionality around
diff --git a/chrome/common/multi_process_lock_unittest.cc b/chrome/common/multi_process_lock_unittest.cc
index 30c4d7b..250e065 100644
--- a/chrome/common/multi_process_lock_unittest.cc
+++ b/chrome/common/multi_process_lock_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/test/multiprocess_test.h"
 #include "base/time.h"
 #include "chrome/common/multi_process_lock.h"
diff --git a/chrome/common/omaha_query_params/omaha_query_params.cc b/chrome/common/omaha_query_params/omaha_query_params.cc
index 6cd91fe..6db55d9 100644
--- a/chrome/common/omaha_query_params/omaha_query_params.cc
+++ b/chrome/common/omaha_query_params/omaha_query_params.cc
@@ -5,7 +5,7 @@
 #include "chrome/common/omaha_query_params/omaha_query_params.h"
 
 #include "base/compiler_specific.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_version_info.h"
 
diff --git a/chrome/common/pref_names_util.cc b/chrome/common/pref_names_util.cc
index 1b1e4dd..7ab3db3 100644
--- a/chrome/common/pref_names_util.cc
+++ b/chrome/common/pref_names_util.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/common/pref_names_util.h"
 
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 
 namespace pref_names_util {
 
diff --git a/chrome/common/print_messages.cc b/chrome/common/print_messages.cc
index 9d0111f..a7ff157 100644
--- a/chrome/common/print_messages.cc
+++ b/chrome/common/print_messages.cc
@@ -5,7 +5,7 @@
 #include "chrome/common/print_messages.h"
 
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ui/gfx/size.h"
 
 PrintMsg_Print_Params::PrintMsg_Print_Params()
diff --git a/chrome/common/profiling.cc b/chrome/common/profiling.cc
index bc67873..1acb43f 100644
--- a/chrome/common/profiling.cc
+++ b/chrome/common/profiling.cc
@@ -10,7 +10,7 @@
 #include "base/debug/profiler.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/threading/thread.h"
 #include "chrome/common/chrome_switches.h"
 #include "v8/include/v8.h"
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 70d5ac7..7d7ed1b 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -12,8 +12,8 @@
 #include "base/files/file_path.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
-#include "base/string16.h"
-#include "base/stringprintf.h"
+#include "base/strings/string16.h"
+#include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/common/autocomplete_match_type.h"
diff --git a/chrome/common/service_process_util.cc b/chrome/common/service_process_util.cc
index e4273d6..f72e697 100644
--- a/chrome/common/service_process_util.cc
+++ b/chrome/common/service_process_util.cc
@@ -10,9 +10,9 @@
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/sha1.h"
-#include "base/string16.h"
-#include "base/string_util.h"
+#include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/version.h"
 #include "chrome/common/chrome_constants.h"
diff --git a/chrome/common/service_process_util_mac.mm b/chrome/common/service_process_util_mac.mm
index 71ee93f..4848b80 100644
--- a/chrome/common/service_process_util_mac.mm
+++ b/chrome/common/service_process_util_mac.mm
@@ -19,8 +19,8 @@
 #include "base/memory/scoped_nsobject.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/version.h"
diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc
index ab55767..a7dcf0e 100644
--- a/chrome/common/service_process_util_unittest.cc
+++ b/chrome/common/service_process_util_unittest.cc
@@ -13,7 +13,7 @@
 #if !defined(OS_MACOSX)
 #include "base/at_exit.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_timeouts.h"
diff --git a/chrome/common/service_process_util_win.cc b/chrome/common/service_process_util_win.cc
index 5ae1903..ad8832d 100644
--- a/chrome/common/service_process_util_win.cc
+++ b/chrome/common/service_process_util_win.cc
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/object_watcher.h"
 #include "base/win/scoped_handle.h"
diff --git a/chrome/common/spellcheck_result.h b/chrome/common/spellcheck_result.h
index 262b06d..fe2b4ae 100644
--- a/chrome/common/spellcheck_result.h
+++ b/chrome/common/spellcheck_result.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_COMMON_SPELLCHECK_RESULT_H_
 #define CHROME_COMMON_SPELLCHECK_RESULT_H_
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 // This class mirrors WebKit::WebTextCheckingResult which holds a
 // misspelled range inside the checked text. It also contains a
diff --git a/chrome/common/thumbnail_score.cc b/chrome/common/thumbnail_score.cc
index ee9a031..5d3d698 100644
--- a/chrome/common/thumbnail_score.cc
+++ b/chrome/common/thumbnail_score.cc
@@ -5,7 +5,7 @@
 #include "chrome/common/thumbnail_score.h"
 
 #include "base/logging.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/chrome/common/time_format.cc b/chrome/common/time_format.cc
index 3461b24..402e3b9 100644
--- a/chrome/common/time_format.cc
+++ b/chrome/common/time_format.cc
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/stl_util.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/common/time_format.h b/chrome/common/time_format.h
index f21ee2f..93ec595 100644
--- a/chrome/common/time_format.h
+++ b/chrome/common/time_format.h
@@ -6,7 +6,7 @@
 #define CHROME_COMMON_TIME_FORMAT_H_
 
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 class Time;
diff --git a/chrome/common/time_format_browsertest.cc b/chrome/common/time_format_browsertest.cc
index df60f48..649ac02 100644
--- a/chrome/common/time_format_browsertest.cc
+++ b/chrome/common/time_format_browsertest.cc
@@ -10,7 +10,7 @@
 // icu is used, and that the "wrong" static value doesn't affect other tests,
 // this test is executed on its own process.
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_locale.h"
 #include "chrome/common/time_format.h"
diff --git a/chrome/common/time_format_unittest.cc b/chrome/common/time_format_unittest.cc
index f46526a..8d21f3cd 100644
--- a/chrome/common/time_format_unittest.cc
+++ b/chrome/common/time_format_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/common/time_format.h"
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/common/translate/language_detection_details.h b/chrome/common/translate/language_detection_details.h
index 938ec40..e93504d 100644
--- a/chrome/common/translate/language_detection_details.h
+++ b/chrome/common/translate/language_detection_details.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
diff --git a/chrome/common/tts_utterance_request.h b/chrome/common/tts_utterance_request.h
index 4465c2c..e652b5a 100644
--- a/chrome/common/tts_utterance_request.h
+++ b/chrome/common/tts_utterance_request.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 struct TtsUtteranceRequest {
   TtsUtteranceRequest();
diff --git a/chrome/common/validation_message_messages.h b/chrome/common/validation_message_messages.h
index 01b6d7f..1c4236e 100644
--- a/chrome/common/validation_message_messages.h
+++ b/chrome/common/validation_message_messages.h
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "ipc/ipc_message_macros.h"
 #include "ui/gfx/rect.h"
 
diff --git a/chrome/common/web_application_info.h b/chrome/common/web_application_info.h
index 0e36640..aeebe2a 100644
--- a/chrome/common/web_application_info.h
+++ b/chrome/common/web_application_info.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/size.h"