Use a direct include of strings headers in components/, part 1.

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

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

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

49 files changed, 56 insertions, 56 deletions

diff --git a/components/autofill/browser/address.cc b/components/autofill/browser/address.cc
index c4c99eb..0730be8 100644
--- a/components/autofill/browser/address.cc
+++ b/components/autofill/browser/address.cc
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_field.h"
diff --git a/components/autofill/browser/address.h b/components/autofill/browser/address.h
index 032a3fe..d4d0386 100644
--- a/components/autofill/browser/address.h
+++ b/components/autofill/browser/address.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "components/autofill/browser/autofill_type.h"
 #include "components/autofill/browser/field_types.h"
 #include "components/autofill/browser/form_group.h"
diff --git a/components/autofill/browser/address_field.cc b/components/autofill/browser/address_field.cc
index 89cea89..408a4db 100644
--- a/components/autofill/browser/address_field.cc
+++ b/components/autofill/browser/address_field.cc
@@ -8,8 +8,8 @@
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.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 "components/autofill/browser/autofill_field.h"
 #include "components/autofill/browser/autofill_regex_constants.h"
diff --git a/components/autofill/browser/address_field.h b/components/autofill/browser/address_field.h
index 83b06c7..4e36858 100644
--- a/components/autofill/browser/address_field.h
+++ b/components/autofill/browser/address_field.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "components/autofill/browser/autofill_type.h"
 #include "components/autofill/browser/form_field.h"
 
diff --git a/components/autofill/browser/address_field_unittest.cc b/components/autofill/browser/address_field_unittest.cc
index 76de6c3..08d9663 100644
--- a/components/autofill/browser/address_field_unittest.cc
+++ b/components/autofill/browser/address_field_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/browser/address_field.h"
 #include "components/autofill/browser/autofill_field.h"
diff --git a/components/autofill/browser/address_unittest.cc b/components/autofill/browser/address_unittest.cc
index 54bedb4..81830f8 100644
--- a/components/autofill/browser/address_unittest.cc
+++ b/components/autofill/browser/address_unittest.cc
@@ -5,7 +5,7 @@
 #include <string>
 
 #include "base/message_loop.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/browser/address.h"
 #include "components/autofill/browser/autofill_type.h"
diff --git a/components/autofill/browser/android/auxiliary_profile_loader_android.h b/components/autofill/browser/android/auxiliary_profile_loader_android.h
index 27746c4..787fd25 100644
--- a/components/autofill/browser/android/auxiliary_profile_loader_android.h
+++ b/components/autofill/browser/android/auxiliary_profile_loader_android.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/android/jni_android.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace autofill {
 
diff --git a/components/autofill/browser/android/auxiliary_profile_unittest_android.cc b/components/autofill/browser/android/auxiliary_profile_unittest_android.cc
index 4d45903..35daf66 100644
--- a/components/autofill/browser/android/auxiliary_profile_unittest_android.cc
+++ b/components/autofill/browser/android/auxiliary_profile_unittest_android.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/memory/scoped_vector.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/browser/android/auxiliary_profile_loader_android.h"
 #include "components/autofill/browser/android/auxiliary_profiles_android.h"
diff --git a/components/autofill/browser/android/auxiliary_profiles_android.cc b/components/autofill/browser/android/auxiliary_profiles_android.cc
index e5e9ab2..2c141f7 100644
--- a/components/autofill/browser/android/auxiliary_profiles_android.cc
+++ b/components/autofill/browser/android/auxiliary_profiles_android.cc
@@ -11,8 +11,8 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.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 "components/autofill/browser/android/auxiliary_profile_loader_android.h"
 #include "components/autofill/browser/autofill_profile.h"
diff --git a/components/autofill/browser/android/auxiliary_profiles_android.h b/components/autofill/browser/android/auxiliary_profiles_android.h
index 0915df1..559b428 100644
--- a/components/autofill/browser/android/auxiliary_profiles_android.h
+++ b/components/autofill/browser/android/auxiliary_profiles_android.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "components/autofill/browser/android/auxiliary_profile_loader_android.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/autocheckout/whitelist_manager.cc b/components/autofill/browser/autocheckout/whitelist_manager.cc
index 60ab2db..ed67d52 100644
--- a/components/autofill/browser/autocheckout/whitelist_manager.cc
+++ b/components/autofill/browser/autocheckout/whitelist_manager.cc
@@ -8,8 +8,8 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
-#include "base/string_util.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "components/autofill/common/autofill_switches.h"
 #include "content/public/browser/browser_context.h"
 #include "googleurl/src/gurl.h"
diff --git a/components/autofill/browser/autocheckout_manager.h b/components/autofill/browser/autocheckout_manager.h
index 4c996f2..ed4fb63 100644
--- a/components/autofill/browser/autocheckout_manager.h
+++ b/components/autofill/browser/autocheckout_manager.h
@@ -10,7 +10,7 @@
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/threading/thread_checker.h"
 #include "components/autofill/browser/autocheckout_page_meta_data.h"
 #include "components/autofill/common/autocheckout_status.h"
diff --git a/components/autofill/browser/autocomplete_history_manager.cc b/components/autofill/browser/autocomplete_history_manager.cc
index f3f6f3f..53cf8f9 100644
--- a/components/autofill/browser/autocomplete_history_manager.cc
+++ b/components/autofill/browser/autocomplete_history_manager.cc
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "base/prefs/pref_service.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/browser/autofill_external_delegate.h"
 #include "components/autofill/browser/validation.h"
diff --git a/components/autofill/browser/autocomplete_history_manager_unittest.cc b/components/autofill/browser/autocomplete_history_manager_unittest.cc
index 57da55a..0a3680d 100644
--- a/components/autofill/browser/autocomplete_history_manager_unittest.cc
+++ b/components/autofill/browser/autocomplete_history_manager_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
diff --git a/components/autofill/browser/autofill_country.cc b/components/autofill/browser/autofill_country.cc
index 60410b7..af16359 100644
--- a/components/autofill/browser/autofill_country.cc
+++ b/components/autofill/browser/autofill_country.cc
@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.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 "grit/component_resources.h"
 #include "third_party/icu/public/common/unicode/locid.h"
diff --git a/components/autofill/browser/autofill_country.h b/components/autofill/browser/autofill_country.h
index ea65911..3fa8415 100644
--- a/components/autofill/browser/autofill_country.h
+++ b/components/autofill/browser/autofill_country.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace autofill {
 
diff --git a/components/autofill/browser/autofill_country_unittest.cc b/components/autofill/browser/autofill_country_unittest.cc
index a94cdec..e2f154c 100644
--- a/components/autofill/browser/autofill_country_unittest.cc
+++ b/components/autofill/browser/autofill_country_unittest.cc
@@ -4,7 +4,7 @@
 
 #include <string>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/autofill_data_model.cc b/components/autofill/browser/autofill_data_model.cc
index b8d0ad2..cf4b0a3 100644
--- a/components/autofill/browser/autofill_data_model.cc
+++ b/components/autofill/browser/autofill_data_model.cc
@@ -6,8 +6,8 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_field.h"
diff --git a/components/autofill/browser/autofill_download.cc b/components/autofill/browser/autofill_download.cc
index 409d586..cac6ae9 100644
--- a/components/autofill/browser/autofill_download.cc
+++ b/components/autofill/browser/autofill_download.cc
@@ -12,7 +12,7 @@
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "components/autofill/browser/autofill_download_url.h"
 #include "components/autofill/browser/autofill_metrics.h"
 #include "components/autofill/browser/autofill_xml_parser.h"
diff --git a/components/autofill/browser/autofill_download_unittest.cc b/components/autofill/browser/autofill_download_unittest.cc
index 04976b3..7e76ad5 100644
--- a/components/autofill/browser/autofill_download_unittest.cc
+++ b/components/autofill/browser/autofill_download_unittest.cc
@@ -5,7 +5,7 @@
 #include <list>
 
 #include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/test/base/testing_browser_process.h"
diff --git a/components/autofill/browser/autofill_external_delegate.h b/components/autofill/browser/autofill_external_delegate.h
index 5ea7b37..1e1acef 100644
--- a/components/autofill/browser/autofill_external_delegate.h
+++ b/components/autofill/browser/autofill_external_delegate.h
@@ -9,7 +9,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "components/autofill/browser/autofill_popup_delegate.h"
 #include "components/autofill/browser/password_autofill_manager.h"
 #include "components/autofill/common/form_data.h"
diff --git a/components/autofill/browser/autofill_external_delegate_unittest.cc b/components/autofill/browser/autofill_external_delegate_unittest.cc
index 4554844..bd0bda5 100644
--- a/components/autofill/browser/autofill_external_delegate_unittest.cc
+++ b/components/autofill/browser/autofill_external_delegate_unittest.cc
@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
diff --git a/components/autofill/browser/autofill_field.h b/components/autofill/browser/autofill_field.h
index d2b1543..68c3f77 100644
--- a/components/autofill/browser/autofill_field.h
+++ b/components/autofill/browser/autofill_field.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "components/autofill/browser/field_types.h"
 #include "components/autofill/common/form_field_data.h"
 
diff --git a/components/autofill/browser/autofill_field_unittest.cc b/components/autofill/browser/autofill_field_unittest.cc
index 8dab932..2072d23 100644
--- a/components/autofill/browser/autofill_field_unittest.cc
+++ b/components/autofill/browser/autofill_field_unittest.cc
@@ -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/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/browser/autofill_field.h"
 #include "components/autofill/browser/field_types.h"
diff --git a/components/autofill/browser/autofill_ie_toolbar_import_win.cc b/components/autofill/browser/autofill_ie_toolbar_import_win.cc
index 5ea9500..0020eb3 100644
--- a/components/autofill/browser/autofill_ie_toolbar_import_win.cc
+++ b/components/autofill/browser/autofill_ie_toolbar_import_win.cc
@@ -12,7 +12,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/win/registry.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
diff --git a/components/autofill/browser/autofill_ie_toolbar_import_win_unittest.cc b/components/autofill/browser/autofill_ie_toolbar_import_win_unittest.cc
index c1e09e3..a4e1dc9 100644
--- a/components/autofill/browser/autofill_ie_toolbar_import_win_unittest.cc
+++ b/components/autofill/browser/autofill_ie_toolbar_import_win_unittest.cc
@@ -5,7 +5,7 @@
 #include "components/autofill/browser/autofill_ie_toolbar_import_win.h"
 
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/win/registry.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
diff --git a/components/autofill/browser/autofill_manager.cc b/components/autofill/browser/autofill_manager.cc
index 7a5198b..e7b2171 100644
--- a/components/autofill/browser/autofill_manager.cc
+++ b/components/autofill/browser/autofill_manager.cc
@@ -16,8 +16,8 @@
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/prefs/pref_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/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/autofill/browser/autocheckout/whitelist_manager.h"
diff --git a/components/autofill/browser/autofill_manager.h b/components/autofill/browser/autofill_manager.h
index 35aa535..d164923 100644
--- a/components/autofill/browser/autofill_manager.h
+++ b/components/autofill/browser/autofill_manager.h
@@ -17,7 +17,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/supports_user_data.h"
 #include "base/time.h"
 #include "components/autofill/browser/autocheckout_manager.h"
diff --git a/components/autofill/browser/autofill_manager_delegate.h b/components/autofill/browser/autofill_manager_delegate.h
index 750a182..5563b9f 100644
--- a/components/autofill/browser/autofill_manager_delegate.h
+++ b/components/autofill/browser/autofill_manager_delegate.h
@@ -9,7 +9,7 @@
 
 #include "base/callback_forward.h"
 #include "base/memory/weak_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace content {
 struct PasswordForm;
diff --git a/components/autofill/browser/autofill_manager_unittest.cc b/components/autofill/browser/autofill_manager_unittest.cc
index 93b417a..1ee3fd7 100644
--- a/components/autofill/browser/autofill_manager_unittest.cc
+++ b/components/autofill/browser/autofill_manager_unittest.cc
@@ -10,9 +10,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/prefs/pref_service.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/time.h"
 #include "base/tuple.h"
diff --git a/components/autofill/browser/autofill_merge_unittest.cc b/components/autofill/browser/autofill_merge_unittest.cc
index 1925763..3a3f7cc 100644
--- a/components/autofill/browser/autofill_merge_unittest.cc
+++ b/components/autofill/browser/autofill_merge_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/browser/autofill_common_test.h"
 #include "components/autofill/browser/autofill_type.h"
diff --git a/components/autofill/browser/autofill_metrics_unittest.cc b/components/autofill/browser/autofill_metrics_unittest.cc
index 741317a..d716226 100644
--- a/components/autofill/browser/autofill_metrics_unittest.cc
+++ b/components/autofill/browser/autofill_metrics_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
 #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
diff --git a/components/autofill/browser/autofill_popup_delegate.h b/components/autofill/browser/autofill_popup_delegate.h
index 78237fe..4d990a6 100644
--- a/components/autofill/browser/autofill_popup_delegate.h
+++ b/components/autofill/browser/autofill_popup_delegate.h
@@ -5,7 +5,7 @@
 #ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_POPUP_DELEGATE_H_
 #define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_POPUP_DELEGATE_H_
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace content {
 class KeyboardListener;
diff --git a/components/autofill/browser/autofill_profile.cc b/components/autofill/browser/autofill_profile.cc
index 976cee9..0748622 100644
--- a/components/autofill/browser/autofill_profile.cc
+++ b/components/autofill/browser/autofill_profile.cc
@@ -13,7 +13,7 @@
 #include "base/basictypes.h"
 #include "base/guid.h"
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/browser/address.h"
 #include "components/autofill/browser/autofill_country.h"
diff --git a/components/autofill/browser/autofill_profile.h b/components/autofill/browser/autofill_profile.h
index 76404d5..00e6134 100644
--- a/components/autofill/browser/autofill_profile.h
+++ b/components/autofill/browser/autofill_profile.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "components/autofill/browser/address.h"
 #include "components/autofill/browser/autofill_data_model.h"
 #include "components/autofill/browser/autofill_type.h"
diff --git a/components/autofill/browser/autofill_profile_unittest.cc b/components/autofill/browser/autofill_profile_unittest.cc
index 5d6dfff..c42e4c4 100644
--- a/components/autofill/browser/autofill_profile_unittest.cc
+++ b/components/autofill/browser/autofill_profile_unittest.cc
@@ -7,8 +7,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/stl_util.h"
-#include "base/string16.h"
-#include "base/stringprintf.h"
+#include "base/strings/string16.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/browser/autofill_common_test.h"
 #include "components/autofill/browser/autofill_profile.h"
diff --git a/components/autofill/browser/autofill_regexes.cc b/components/autofill/browser/autofill_regexes.cc
index 18bf96b..df53267 100644
--- a/components/autofill/browser/autofill_regexes.cc
+++ b/components/autofill/browser/autofill_regexes.cc
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/stl_util.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "third_party/icu/public/i18n/unicode/regex.h"
 
 namespace {
diff --git a/components/autofill/browser/autofill_regexes.h b/components/autofill/browser/autofill_regexes.h
index cfd23ef..1267871 100644
--- a/components/autofill/browser/autofill_regexes.h
+++ b/components/autofill/browser/autofill_regexes.h
@@ -5,7 +5,7 @@
 #ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_REGEXES_H_
 #define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_REGEXES_H_
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 // Parsing utilities.
 namespace autofill {
diff --git a/components/autofill/browser/autofill_regexes_unittest.cc b/components/autofill/browser/autofill_regexes_unittest.cc
index cec6247..cac9691 100644
--- a/components/autofill/browser/autofill_regexes_unittest.cc
+++ b/components/autofill/browser/autofill_regexes_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "components/autofill/browser/autofill_regexes.h"
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/browser/autofill_regex_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/autofill_scanner.h b/components/autofill/browser/autofill_scanner.h
index eac38b1..f1dcf85 100644
--- a/components/autofill/browser/autofill_scanner.h
+++ b/components/autofill/browser/autofill_scanner.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace autofill {
 
diff --git a/components/autofill/browser/autofill_type.h b/components/autofill/browser/autofill_type.h
index cad2505a..34bbbed 100644
--- a/components/autofill/browser/autofill_type.h
+++ b/components/autofill/browser/autofill_type.h
@@ -9,7 +9,7 @@
 #include <set>
 #include <string>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "components/autofill/browser/field_types.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/contact_info.cc b/components/autofill/browser/contact_info.cc
index 85b7736..20b3063 100644
--- a/components/autofill/browser/contact_info.cc
+++ b/components/autofill/browser/contact_info.cc
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/browser/autofill_type.h"
 #include "components/autofill/browser/field_types.h"
diff --git a/components/autofill/browser/contact_info.h b/components/autofill/browser/contact_info.h
index 5fc920a..3d96636f 100644
--- a/components/autofill/browser/contact_info.h
+++ b/components/autofill/browser/contact_info.h
@@ -9,7 +9,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "components/autofill/browser/field_types.h"
 #include "components/autofill/browser/form_group.h"
 
diff --git a/components/autofill/browser/contact_info_unittest.cc b/components/autofill/browser/contact_info_unittest.cc
index 659b1571..7ca72b7 100644
--- a/components/autofill/browser/contact_info_unittest.cc
+++ b/components/autofill/browser/contact_info_unittest.cc
@@ -5,7 +5,7 @@
 #include "components/autofill/browser/contact_info.h"
 
 #include "base/basictypes.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/browser/autofill_type.h"
 #include "components/autofill/browser/field_types.h"
diff --git a/components/autofill/browser/credit_card.cc b/components/autofill/browser/credit_card.cc
index 0433231..5308daa1 100644
--- a/components/autofill/browser/credit_card.cc
+++ b/components/autofill/browser/credit_card.cc
@@ -12,10 +12,10 @@
 #include "base/basictypes.h"
 #include "base/guid.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_split.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/browser/autofill_field.h"
 #include "components/autofill/browser/autofill_regexes.h"
diff --git a/components/autofill/browser/credit_card.h b/components/autofill/browser/credit_card.h
index c17babb..315d560 100644
--- a/components/autofill/browser/credit_card.h
+++ b/components/autofill/browser/credit_card.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "components/autofill/browser/autofill_data_model.h"
 #include "components/autofill/browser/field_types.h"
 
diff --git a/components/autofill/browser/credit_card_field.cc b/components/autofill/browser/credit_card_field.cc
index 94caf1a..6661b40 100644
--- a/components/autofill/browser/credit_card_field.cc
+++ b/components/autofill/browser/credit_card_field.cc
@@ -8,8 +8,8 @@
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.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 "components/autofill/browser/autofill_field.h"
 #include "components/autofill/browser/autofill_regex_constants.h"
diff --git a/components/autofill/browser/data_driven_test.cc b/components/autofill/browser/data_driven_test.cc
index 9d0399e..f04f43a 100644
--- a/components/autofill/browser/data_driven_test.cc
+++ b/components/autofill/browser/data_driven_test.cc
@@ -7,7 +7,7 @@
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/path_service.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/autofill/browser/data_driven_test.h b/components/autofill/browser/data_driven_test.h
index 27fa2f9..2fac87c 100644
--- a/components/autofill/browser/data_driven_test.h
+++ b/components/autofill/browser/data_driven_test.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/files/file_path.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace autofill {