summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 01:40:57 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 01:40:57 +0000
commit9c7ddc9560ece724ac96f5e893e8ef2fd217c52f (patch)
treed152e5ce33a85ed9ad623412f244ba9b127efefc /chrome
parent416364df29b04a632cc3564ae3878a1b348e4fd5 (diff)
downloadchromium_src-9c7ddc9560ece724ac96f5e893e8ef2fd217c52f.zip
chromium_src-9c7ddc9560ece724ac96f5e893e8ef2fd217c52f.tar.gz
chromium_src-9c7ddc9560ece724ac96f5e893e8ef2fd217c52f.tar.bz2
Use a direct include of strings headers in chrome/browser/i*/.
BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/15798020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/icon_loader_chromeos.cc2
-rw-r--r--chrome/browser/importer/external_process_importer_client.h2
-rw-r--r--chrome/browser/importer/firefox3_importer.cc2
-rw-r--r--chrome/browser/importer/firefox_importer_browsertest.cc4
-rw-r--r--chrome/browser/importer/firefox_importer_utils.cc4
-rw-r--r--chrome/browser/importer/firefox_importer_utils.h2
-rw-r--r--chrome/browser/importer/firefox_importer_utils_win.cc2
-rw-r--r--chrome/browser/importer/firefox_profile_lock_unittest.cc2
-rw-r--r--chrome/browser/importer/firefox_proxy_settings.cc2
-rw-r--r--chrome/browser/importer/ie_importer.cc4
-rw-r--r--chrome/browser/importer/ie_importer.h2
-rw-r--r--chrome/browser/importer/ie_importer_browsertest_win.cc4
-rw-r--r--chrome/browser/importer/ie_importer_test_registry_overrider_win.h2
-rw-r--r--chrome/browser/importer/ie_importer_unittest_win.cc2
-rw-r--r--chrome/browser/importer/ie_importer_utils_win.h2
-rw-r--r--chrome/browser/importer/importer_bridge.h2
-rw-r--r--chrome/browser/importer/importer_data_types.h2
-rw-r--r--chrome/browser/importer/importer_list.h2
-rw-r--r--chrome/browser/importer/nss_decryptor.cc2
-rw-r--r--chrome/browser/importer/nss_decryptor_mac.h2
-rw-r--r--chrome/browser/importer/nss_decryptor_null.h2
-rw-r--r--chrome/browser/importer/nss_decryptor_system_nss.cc2
-rw-r--r--chrome/browser/importer/nss_decryptor_system_nss.h2
-rw-r--r--chrome/browser/importer/nss_decryptor_win.h2
-rw-r--r--chrome/browser/importer/profile_import_process_messages.h2
-rw-r--r--chrome/browser/importer/profile_writer.cc2
-rw-r--r--chrome/browser/importer/profile_writer.h2
-rw-r--r--chrome/browser/importer/safari_importer.mm2
-rw-r--r--chrome/browser/importer/safari_importer_unittest.mm4
-rw-r--r--chrome/browser/importer/toolbar_importer.h2
-rw-r--r--chrome/browser/importer/toolbar_importer_unittest.cc4
-rw-r--r--chrome/browser/infobars/confirm_infobar_delegate.h2
-rw-r--r--chrome/browser/infobars/infobar_delegate.h2
-rw-r--r--chrome/browser/infobars/infobar_extension_api.cc2
-rw-r--r--chrome/browser/infobars/simple_alert_infobar_delegate.h2
-rw-r--r--chrome/browser/internal_auth.cc2
-rw-r--r--chrome/browser/invalidation/invalidator_storage_unittest.cc2
-rw-r--r--chrome/browser/io_thread.cc2
38 files changed, 44 insertions, 44 deletions
diff --git a/chrome/browser/icon_loader_chromeos.cc b/chrome/browser/icon_loader_chromeos.cc
index 796e861..db95067 100644
--- a/chrome/browser/icon_loader_chromeos.cc
+++ b/chrome/browser/icon_loader_chromeos.cc
@@ -13,7 +13,7 @@
#include "base/lazy_instance.h"
#include "base/memory/ref_counted_memory.h"
#include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "chrome/browser/icon_loader.h"
#include "grit/theme_resources.h"
#include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/importer/external_process_importer_client.h b/chrome/browser/importer/external_process_importer_client.h
index 5c66751..f5a03d7 100644
--- a/chrome/browser/importer/external_process_importer_client.h
+++ b/chrome/browser/importer/external_process_importer_client.h
@@ -11,7 +11,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/weak_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "chrome/browser/history/history_types.h"
#include "chrome/browser/importer/importer_data_types.h"
#include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc
index 953c075..e58fa81 100644
--- a/chrome/browser/importer/firefox3_importer.cc
+++ b/chrome/browser/importer/firefox3_importer.cc
@@ -11,7 +11,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "base/stl_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_html_reader.h"
#include "chrome/browser/bookmarks/imported_bookmark_entry.h"
diff --git a/chrome/browser/importer/firefox_importer_browsertest.cc b/chrome/browser/importer/firefox_importer_browsertest.cc
index 9823523..0a9290a 100644
--- a/chrome/browser/importer/firefox_importer_browsertest.cc
+++ b/chrome/browser/importer/firefox_importer_browsertest.cc
@@ -8,8 +8,8 @@
#include "base/message_loop.h"
#include "base/path_service.h"
#include "base/stl_util.h"
-#include "base/string16.h"
-#include "base/string_util.h"
+#include "base/strings/string16.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/bookmarks/imported_bookmark_entry.h"
#include "chrome/browser/favicon/imported_favicon_usage.h"
diff --git a/chrome/browser/importer/firefox_importer_utils.cc b/chrome/browser/importer/firefox_importer_utils.cc
index 62591ad..70c11f1 100644
--- a/chrome/browser/importer/firefox_importer_utils.cc
+++ b/chrome/browser/importer/firefox_importer_utils.cc
@@ -10,10 +10,10 @@
#include "base/file_util.h"
#include "base/logging.h"
-#include "base/string_util.h"
-#include "base/stringprintf.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/values.h"
#include "chrome/browser/search_engines/template_url.h"
diff --git a/chrome/browser/importer/firefox_importer_utils.h b/chrome/browser/importer/firefox_importer_utils.h
index f723ba4..54e7162 100644
--- a/chrome/browser/importer/firefox_importer_utils.h
+++ b/chrome/browser/importer/firefox_importer_utils.h
@@ -9,7 +9,7 @@
#include <vector>
#include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "build/build_config.h"
class GURL;
diff --git a/chrome/browser/importer/firefox_importer_utils_win.cc b/chrome/browser/importer/firefox_importer_utils_win.cc
index dc6e1ad..68a4453 100644
--- a/chrome/browser/importer/firefox_importer_utils_win.cc
+++ b/chrome/browser/importer/firefox_importer_utils_win.cc
@@ -8,7 +8,7 @@
#include "base/file_util.h"
#include "base/path_service.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "base/win/registry.h"
// NOTE: Keep these in order since we need test all those paths according
diff --git a/chrome/browser/importer/firefox_profile_lock_unittest.cc b/chrome/browser/importer/firefox_profile_lock_unittest.cc
index 1f1f043..7506a71 100644
--- a/chrome/browser/importer/firefox_profile_lock_unittest.cc
+++ b/chrome/browser/importer/firefox_profile_lock_unittest.cc
@@ -6,7 +6,7 @@
#include "base/files/scoped_temp_dir.h"
#include "base/path_service.h"
#include "base/process_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "build/build_config.h"
#include "chrome/browser/importer/firefox_profile_lock.h"
#include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/importer/firefox_proxy_settings.cc b/chrome/browser/importer/firefox_proxy_settings.cc
index 2f52269..75d5735 100644
--- a/chrome/browser/importer/firefox_proxy_settings.cc
+++ b/chrome/browser/importer/firefox_proxy_settings.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/importer/firefox_proxy_settings.h"
#include "base/files/file_path.h"
-#include "base/string_util.h"
#include "base/strings/string_tokenizer.h"
+#include "base/strings/string_util.h"
#include "base/values.h"
#include "chrome/browser/importer/firefox_importer_utils.h"
#include "net/proxy/proxy_config.h"
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc
index d7c632c..cb6e7a2 100644
--- a/chrome/browser/importer/ie_importer.cc
+++ b/chrome/browser/importer/ie_importer.cc
@@ -18,9 +18,9 @@
#include "base/file_util.h"
#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
-#include "base/string16.h"
-#include "base/string_util.h"
+#include "base/strings/string16.h"
#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
#include "base/win/registry.h"
diff --git a/chrome/browser/importer/ie_importer.h b/chrome/browser/importer/ie_importer.h
index a523d8f..c96200c 100644
--- a/chrome/browser/importer/ie_importer.h
+++ b/chrome/browser/importer/ie_importer.h
@@ -11,7 +11,7 @@
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
#include "base/gtest_prod_util.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "chrome/browser/importer/importer.h"
struct ImportedBookmarkEntry;
diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc
index 10089f2..b281b57 100644
--- a/chrome/browser/importer/ie_importer_browsertest_win.cc
+++ b/chrome/browser/importer/ie_importer_browsertest_win.cc
@@ -21,8 +21,8 @@
#include "base/message_loop.h"
#include "base/path_service.h"
#include "base/stl_util.h"
-#include "base/string16.h"
-#include "base/string_util.h"
+#include "base/strings/string16.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/registry.h"
#include "base/win/scoped_comptr.h"
diff --git a/chrome/browser/importer/ie_importer_test_registry_overrider_win.h b/chrome/browser/importer/ie_importer_test_registry_overrider_win.h
index 0a6726a..11b4674 100644
--- a/chrome/browser/importer/ie_importer_test_registry_overrider_win.h
+++ b/chrome/browser/importer/ie_importer_test_registry_overrider_win.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_IMPORTER_IE_IMPORTER_TEST_REGISTRY_OVERRIDER_WIN_H_
#include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
// A helper class to let tests generate a random registry key to be used in
// HKEY_CURRENT_USER in tests. After the key has been generated by constructing
diff --git a/chrome/browser/importer/ie_importer_unittest_win.cc b/chrome/browser/importer/ie_importer_unittest_win.cc
index ce85d46..df16ade 100644
--- a/chrome/browser/importer/ie_importer_unittest_win.cc
+++ b/chrome/browser/importer/ie_importer_unittest_win.cc
@@ -8,7 +8,7 @@
#include <vector>
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "components/webdata/encryptor/ie7_password.h"
TEST(IEImporterTest, IE7Importer) {
diff --git a/chrome/browser/importer/ie_importer_utils_win.h b/chrome/browser/importer/ie_importer_utils_win.h
index 48c511d..ff61453 100644
--- a/chrome/browser/importer/ie_importer_utils_win.h
+++ b/chrome/browser/importer/ie_importer_utils_win.h
@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_IMPORTER_IE_IMPORTER_UTILS_WIN_H_
#define CHROME_BROWSER_IMPORTER_IE_IMPORTER_UTILS_WIN_H_
-#include "base/string16.h"
+#include "base/strings/string16.h"
namespace importer {
diff --git a/chrome/browser/importer/importer_bridge.h b/chrome/browser/importer/importer_bridge.h
index 8d4ac3c..76915d3c 100644
--- a/chrome/browser/importer/importer_bridge.h
+++ b/chrome/browser/importer/importer_bridge.h
@@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "build/build_config.h"
#include "chrome/browser/history/history_types.h"
#include "chrome/browser/importer/importer_data_types.h"
diff --git a/chrome/browser/importer/importer_data_types.h b/chrome/browser/importer/importer_data_types.h
index 90c8075..9b44fb2 100644
--- a/chrome/browser/importer/importer_data_types.h
+++ b/chrome/browser/importer/importer_data_types.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "chrome/browser/importer/importer_type.h"
#include "net/url_request/url_request_context_getter.h"
diff --git a/chrome/browser/importer/importer_list.h b/chrome/browser/importer/importer_list.h
index 43004e2..b31e82d 100644
--- a/chrome/browser/importer/importer_list.h
+++ b/chrome/browser/importer/importer_list.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_vector.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "content/public/browser/browser_thread.h"
#include "net/url_request/url_request_context_getter.h"
diff --git a/chrome/browser/importer/nss_decryptor.cc b/chrome/browser/importer/nss_decryptor.cc
index 904d9b3..6388786 100644
--- a/chrome/browser/importer/nss_decryptor.cc
+++ b/chrome/browser/importer/nss_decryptor.cc
@@ -9,8 +9,8 @@
#include "base/base64.h"
#include "base/memory/scoped_ptr.h"
-#include "base/string_util.h"
#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "content/public/common/password_form.h"
#include "sql/connection.h"
diff --git a/chrome/browser/importer/nss_decryptor_mac.h b/chrome/browser/importer/nss_decryptor_mac.h
index e8c7857..918a227 100644
--- a/chrome/browser/importer/nss_decryptor_mac.h
+++ b/chrome/browser/importer/nss_decryptor_mac.h
@@ -9,7 +9,7 @@
#include <vector>
#include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
namespace base {
class FilePath;
diff --git a/chrome/browser/importer/nss_decryptor_null.h b/chrome/browser/importer/nss_decryptor_null.h
index 5e690f4..a9e6d3b 100644
--- a/chrome/browser/importer/nss_decryptor_null.h
+++ b/chrome/browser/importer/nss_decryptor_null.h
@@ -9,7 +9,7 @@
#include <vector>
#include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
namespace base {
class FilePath;
diff --git a/chrome/browser/importer/nss_decryptor_system_nss.cc b/chrome/browser/importer/nss_decryptor_system_nss.cc
index 4d9212b..9c12fed43 100644
--- a/chrome/browser/importer/nss_decryptor_system_nss.cc
+++ b/chrome/browser/importer/nss_decryptor_system_nss.cc
@@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/files/file_path.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
#include "crypto/nss_util.h"
diff --git a/chrome/browser/importer/nss_decryptor_system_nss.h b/chrome/browser/importer/nss_decryptor_system_nss.h
index 41c4227..b71b500 100644
--- a/chrome/browser/importer/nss_decryptor_system_nss.h
+++ b/chrome/browser/importer/nss_decryptor_system_nss.h
@@ -10,7 +10,7 @@
#include <vector>
#include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
namespace base {
class FilePath;
diff --git a/chrome/browser/importer/nss_decryptor_win.h b/chrome/browser/importer/nss_decryptor_win.h
index 0a7b5ba..d8b208f 100644
--- a/chrome/browser/importer/nss_decryptor_win.h
+++ b/chrome/browser/importer/nss_decryptor_win.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/native_library.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
// The following declarations of functions and types are from Firefox
// NSS library.
diff --git a/chrome/browser/importer/profile_import_process_messages.h b/chrome/browser/importer/profile_import_process_messages.h
index 92c7f5d..ba2d1ab 100644
--- a/chrome/browser/importer/profile_import_process_messages.h
+++ b/chrome/browser/importer/profile_import_process_messages.h
@@ -7,7 +7,7 @@
#include <vector>
#include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "base/values.h"
#include "chrome/browser/bookmarks/imported_bookmark_entry.h"
#include "chrome/browser/favicon/imported_favicon_usage.h"
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
index 136cbd5..5430313 100644
--- a/chrome/browser/importer/profile_writer.cc
+++ b/chrome/browser/importer/profile_writer.cc
@@ -9,8 +9,8 @@
#include <string>
#include "base/prefs/pref_service.h"
-#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/profile_writer.h
index eaa2ec7..cc47044 100644
--- a/chrome/browser/importer/profile_writer.h
+++ b/chrome/browser/importer/profile_writer.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_vector.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "base/time.h"
#include "build/build_config.h"
#include "chrome/browser/history/history_types.h"
diff --git a/chrome/browser/importer/safari_importer.mm b/chrome/browser/importer/safari_importer.mm
index 678a5eb..422cc68 100644
--- a/chrome/browser/importer/safari_importer.mm
+++ b/chrome/browser/importer/safari_importer.mm
@@ -12,7 +12,7 @@
#include "base/file_util.h"
#include "base/mac/mac_util.h"
#include "base/memory/scoped_nsobject.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
diff --git a/chrome/browser/importer/safari_importer_unittest.mm b/chrome/browser/importer/safari_importer_unittest.mm
index 2aa248f..6725b750 100644
--- a/chrome/browser/importer/safari_importer_unittest.mm
+++ b/chrome/browser/importer/safari_importer_unittest.mm
@@ -9,8 +9,8 @@
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
#include "base/path_service.h"
-#include "base/string16.h"
-#include "base/string_util.h"
+#include "base/strings/string16.h"
+#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/bookmarks/imported_bookmark_entry.h"
diff --git a/chrome/browser/importer/toolbar_importer.h b/chrome/browser/importer/toolbar_importer.h
index 202b39b..961b67f 100644
--- a/chrome/browser/importer/toolbar_importer.h
+++ b/chrome/browser/importer/toolbar_importer.h
@@ -15,7 +15,7 @@
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "chrome/browser/importer/importer.h"
#include "net/url_request/url_fetcher_delegate.h"
#include "net/url_request/url_request_context_getter.h"
diff --git a/chrome/browser/importer/toolbar_importer_unittest.cc b/chrome/browser/importer/toolbar_importer_unittest.cc
index 8ff95fe..f8c89dc 100644
--- a/chrome/browser/importer/toolbar_importer_unittest.cc
+++ b/chrome/browser/importer/toolbar_importer_unittest.cc
@@ -7,8 +7,8 @@
#include <string>
#include <vector>
-#include "base/string16.h"
-#include "base/string_util.h"
+#include "base/strings/string16.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/bookmarks/imported_bookmark_entry.h"
#include "chrome/browser/first_run/first_run.h"
diff --git a/chrome/browser/infobars/confirm_infobar_delegate.h b/chrome/browser/infobars/confirm_infobar_delegate.h
index d4e439e..6d10883 100644
--- a/chrome/browser/infobars/confirm_infobar_delegate.h
+++ b/chrome/browser/infobars/confirm_infobar_delegate.h
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "chrome/browser/infobars/infobar_delegate.h"
// An interface derived from InfoBarDelegate implemented by objects wishing to
diff --git a/chrome/browser/infobars/infobar_delegate.h b/chrome/browser/infobars/infobar_delegate.h
index 3509862..2ee34e3 100644
--- a/chrome/browser/infobars/infobar_delegate.h
+++ b/chrome/browser/infobars/infobar_delegate.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_INFOBARS_INFOBAR_DELEGATE_H_
#include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "chrome/browser/infobars/infobar_service.h"
#include "ui/base/window_open_disposition.h"
diff --git a/chrome/browser/infobars/infobar_extension_api.cc b/chrome/browser/infobars/infobar_extension_api.cc
index 12d082f..5454b06 100644
--- a/chrome/browser/infobars/infobar_extension_api.cc
+++ b/chrome/browser/infobars/infobar_extension_api.cc
@@ -4,8 +4,8 @@
#include "chrome/browser/infobars/infobar_extension_api.h"
-#include "base/string_util.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
#include "chrome/browser/extensions/extension_host.h"
diff --git a/chrome/browser/infobars/simple_alert_infobar_delegate.h b/chrome/browser/infobars/simple_alert_infobar_delegate.h
index b680ca8..7d783f6 100644
--- a/chrome/browser/infobars/simple_alert_infobar_delegate.h
+++ b/chrome/browser/infobars/simple_alert_infobar_delegate.h
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "chrome/browser/infobars/confirm_infobar_delegate.h"
class SimpleAlertInfoBarDelegate : public ConfirmInfoBarDelegate {
diff --git a/chrome/browser/internal_auth.cc b/chrome/browser/internal_auth.cc
index d82fb07..0c4fad0 100644
--- a/chrome/browser/internal_auth.cc
+++ b/chrome/browser/internal_auth.cc
@@ -10,9 +10,9 @@
#include "base/base64.h"
#include "base/lazy_instance.h"
#include "base/rand_util.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 "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
#include "base/time.h"
diff --git a/chrome/browser/invalidation/invalidator_storage_unittest.cc b/chrome/browser/invalidation/invalidator_storage_unittest.cc
index 76dea3a..29b1daf 100644
--- a/chrome/browser/invalidation/invalidator_storage_unittest.cc
+++ b/chrome/browser/invalidation/invalidator_storage_unittest.cc
@@ -8,8 +8,8 @@
#include "base/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/prefs/pref_service.h"
-#include "base/string_util.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_pref_service_syncable.h"
#include "sync/internal_api/public/base/invalidation_test_util.h"
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index dd62b06..6714d54 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -16,9 +16,9 @@
#include "base/prefs/pref_registry_simple.h"
#include "base/prefs/pref_service.h"
#include "base/stl_util.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 "base/threading/thread.h"
#include "base/threading/worker_pool.h"
#include "base/time/default_tick_clock.h"