summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 22:23:48 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 22:23:48 +0000
commitd2d79d501a2fdfd01ad1bcc96e4c54549860abe6 (patch)
treee8dc52f8e4f33b398b4d24ba239d9787f203edf5 /components
parentf72c7626dd87b43b9b54a5adb2be941ba9f3e353 (diff)
downloadchromium_src-d2d79d501a2fdfd01ad1bcc96e4c54549860abe6.zip
chromium_src-d2d79d501a2fdfd01ad1bcc96e4c54549860abe6.tar.gz
chromium_src-d2d79d501a2fdfd01ad1bcc96e4c54549860abe6.tar.bz2
Use a direct include of utf_string_conversions.h in chrome_frame/, chromeos/, cloud_print/, components/, courgette/, device/, extensions/.
BUG=none TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16614002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
-rw-r--r--components/autofill/browser/address.cc2
-rw-r--r--components/autofill/browser/address_field.cc2
-rw-r--r--components/autofill/browser/address_field_unittest.cc2
-rw-r--r--components/autofill/browser/address_unittest.cc2
-rw-r--r--components/autofill/browser/android/auxiliary_profile_unittest_android.cc2
-rw-r--r--components/autofill/browser/android/auxiliary_profiles_android.cc2
-rw-r--r--components/autofill/browser/autocheckout_manager.cc2
-rw-r--r--components/autofill/browser/autocheckout_manager_unittest.cc2
-rw-r--r--components/autofill/browser/autocomplete_history_manager.cc2
-rw-r--r--components/autofill/browser/autocomplete_history_manager_unittest.cc2
-rw-r--r--components/autofill/browser/autofill_common_test.cc2
-rw-r--r--components/autofill/browser/autofill_country.cc2
-rw-r--r--components/autofill/browser/autofill_country_unittest.cc2
-rw-r--r--components/autofill/browser/autofill_data_model.cc2
-rw-r--r--components/autofill/browser/autofill_download_unittest.cc2
-rw-r--r--components/autofill/browser/autofill_external_delegate.cc2
-rw-r--r--components/autofill/browser/autofill_field.cc2
-rw-r--r--components/autofill/browser/autofill_field_unittest.cc2
-rw-r--r--components/autofill/browser/autofill_manager.cc2
-rw-r--r--components/autofill/browser/autofill_manager_unittest.cc2
-rw-r--r--components/autofill/browser/autofill_merge_unittest.cc2
-rw-r--r--components/autofill/browser/autofill_metrics_unittest.cc2
-rw-r--r--components/autofill/browser/autofill_profile.cc2
-rw-r--r--components/autofill/browser/autofill_profile_unittest.cc2
-rw-r--r--components/autofill/browser/autofill_regexes_unittest.cc2
-rw-r--r--components/autofill/browser/contact_info.cc2
-rw-r--r--components/autofill/browser/contact_info_unittest.cc2
-rw-r--r--components/autofill/browser/credit_card.cc2
-rw-r--r--components/autofill/browser/credit_card_field.cc2
-rw-r--r--components/autofill/browser/credit_card_field_unittest.cc2
-rw-r--r--components/autofill/browser/credit_card_unittest.cc2
-rw-r--r--components/autofill/browser/email_field.cc2
-rw-r--r--components/autofill/browser/form_field.cc2
-rw-r--r--components/autofill/browser/form_field_unittest.cc2
-rw-r--r--components/autofill/browser/form_structure.cc2
-rw-r--r--components/autofill/browser/form_structure_unittest.cc2
-rw-r--r--components/autofill/browser/name_field.cc2
-rw-r--r--components/autofill/browser/name_field_unittest.cc2
-rw-r--r--components/autofill/browser/password_autofill_manager_unittest.cc2
-rw-r--r--components/autofill/browser/personal_data_manager.cc2
-rw-r--r--components/autofill/browser/personal_data_manager_unittest.cc2
-rw-r--r--components/autofill/browser/phone_field.cc2
-rw-r--r--components/autofill/browser/phone_field_unittest.cc2
-rw-r--r--components/autofill/browser/phone_number.cc2
-rw-r--r--components/autofill/browser/phone_number_i18n.cc2
-rw-r--r--components/autofill/browser/phone_number_i18n_unittest.cc2
-rw-r--r--components/autofill/browser/phone_number_unittest.cc2
-rw-r--r--components/autofill/browser/state_names.cc2
-rw-r--r--components/autofill/browser/validation.cc2
-rw-r--r--components/autofill/browser/validation_unittest.cc2
-rw-r--r--components/autofill/browser/wallet/encryption_escrow_client.cc2
-rw-r--r--components/autofill/browser/wallet/full_wallet.cc2
-rw-r--r--components/autofill/browser/wallet/full_wallet_unittest.cc2
-rw-r--r--components/autofill/browser/wallet/instrument.cc2
-rw-r--r--components/autofill/browser/wallet/instrument_unittest.cc2
-rw-r--r--components/autofill/browser/wallet/wallet_address.cc2
-rw-r--r--components/autofill/browser/wallet/wallet_address_unittest.cc2
-rw-r--r--components/autofill/browser/wallet/wallet_items.cc2
-rw-r--r--components/autofill/browser/wallet/wallet_items_unittest.cc2
-rw-r--r--components/autofill/browser/wallet/wallet_test_util.cc2
-rw-r--r--components/autofill/browser/webdata/autofill_entry.cc2
-rw-r--r--components/autofill/browser/webdata/autofill_entry_unittest.cc2
-rw-r--r--components/autofill/browser/webdata/autofill_table_unittest.cc2
-rw-r--r--components/autofill/browser/webdata/web_data_service_unittest.cc2
-rw-r--r--components/autofill/common/form_field_data.cc2
-rw-r--r--components/autofill/content/browser/risk/fingerprint.cc2
-rw-r--r--components/autofill/content/renderer/autofill_agent.cc2
-rw-r--r--components/autofill/content/renderer/form_autofill_util.cc2
-rw-r--r--components/autofill/content/renderer/form_cache.cc2
-rw-r--r--components/sessions/serialized_navigation_entry.cc2
-rw-r--r--components/sessions/serialized_navigation_entry_test_helper.cc2
-rw-r--r--components/sessions/serialized_navigation_entry_unittest.cc2
-rw-r--r--components/webdata/common/web_database_migration_unittest.cc2
-rw-r--r--components/webdata/encryptor/encryptor_mac.mm2
-rw-r--r--components/webdata/encryptor/encryptor_posix.cc2
-rw-r--r--components/webdata/encryptor/encryptor_unittest.cc2
-rw-r--r--components/webdata/encryptor/encryptor_win.cc2
77 files changed, 77 insertions, 77 deletions
diff --git a/components/autofill/browser/address.cc b/components/autofill/browser/address.cc
index 307cd31..c4c99eb 100644
--- a/components/autofill/browser/address.cc
+++ b/components/autofill/browser/address.cc
@@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_country.h"
#include "components/autofill/browser/autofill_field.h"
#include "components/autofill/browser/autofill_type.h"
diff --git a/components/autofill/browser/address_field.cc b/components/autofill/browser/address_field.cc
index e9f0044..89cea89 100644
--- a/components/autofill/browser/address_field.cc
+++ b/components/autofill/browser/address_field.cc
@@ -10,7 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/string16.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_field.h"
#include "components/autofill/browser/autofill_regex_constants.h"
#include "components/autofill/browser/autofill_scanner.h"
diff --git a/components/autofill/browser/address_field_unittest.cc b/components/autofill/browser/address_field_unittest.cc
index a7f633a..76de6c3 100644
--- a/components/autofill/browser/address_field_unittest.cc
+++ b/components/autofill/browser/address_field_unittest.cc
@@ -5,7 +5,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/string16.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/address_field.h"
#include "components/autofill/browser/autofill_field.h"
#include "components/autofill/browser/autofill_scanner.h"
diff --git a/components/autofill/browser/address_unittest.cc b/components/autofill/browser/address_unittest.cc
index be18ea2..54bedb4 100644
--- a/components/autofill/browser/address_unittest.cc
+++ b/components/autofill/browser/address_unittest.cc
@@ -6,7 +6,7 @@
#include "base/message_loop.h"
#include "base/string16.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/address.h"
#include "components/autofill/browser/autofill_type.h"
#include "content/public/test/test_browser_thread.h"
diff --git a/components/autofill/browser/android/auxiliary_profile_unittest_android.cc b/components/autofill/browser/android/auxiliary_profile_unittest_android.cc
index 1bfcef5..4d45903 100644
--- a/components/autofill/browser/android/auxiliary_profile_unittest_android.cc
+++ b/components/autofill/browser/android/auxiliary_profile_unittest_android.cc
@@ -4,7 +4,7 @@
#include "base/memory/scoped_vector.h"
#include "base/string16.h"
-#include "base/utf_string_conversions.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"
#include "components/autofill/browser/android/test_auxiliary_profile_loader_android.h"
diff --git a/components/autofill/browser/android/auxiliary_profiles_android.cc b/components/autofill/browser/android/auxiliary_profiles_android.cc
index f955121..e5e9ab2 100644
--- a/components/autofill/browser/android/auxiliary_profiles_android.cc
+++ b/components/autofill/browser/android/auxiliary_profiles_android.cc
@@ -13,7 +13,7 @@
#include "base/memory/scoped_vector.h"
#include "base/string16.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.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"
#include "components/autofill/browser/phone_number.h"
diff --git a/components/autofill/browser/autocheckout_manager.cc b/components/autofill/browser/autocheckout_manager.cc
index 2c5ba10..9fb1a83 100644
--- a/components/autofill/browser/autocheckout_manager.cc
+++ b/components/autofill/browser/autocheckout_manager.cc
@@ -6,7 +6,7 @@
#include "base/basictypes.h"
#include "base/bind.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autocheckout_request_manager.h"
#include "components/autofill/browser/autofill_country.h"
#include "components/autofill/browser/autofill_field.h"
diff --git a/components/autofill/browser/autocheckout_manager_unittest.cc b/components/autofill/browser/autocheckout_manager_unittest.cc
index 530e351..5b65cb3 100644
--- a/components/autofill/browser/autocheckout_manager_unittest.cc
+++ b/components/autofill/browser/autocheckout_manager_unittest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/strings/utf_string_conversions.h"
#include "base/tuple.h"
-#include "base/utf_string_conversions.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "chrome/test/base/testing_profile.h"
#include "components/autofill/browser/autocheckout_manager.h"
diff --git a/components/autofill/browser/autocomplete_history_manager.cc b/components/autofill/browser/autocomplete_history_manager.cc
index ca79889..f3f6f3f 100644
--- a/components/autofill/browser/autocomplete_history_manager.cc
+++ b/components/autofill/browser/autocomplete_history_manager.cc
@@ -8,7 +8,7 @@
#include "base/prefs/pref_service.h"
#include "base/string16.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_external_delegate.h"
#include "components/autofill/browser/validation.h"
#include "components/autofill/common/autofill_messages.h"
diff --git a/components/autofill/browser/autocomplete_history_manager_unittest.cc b/components/autofill/browser/autocomplete_history_manager_unittest.cc
index 5294593..57da55a 100644
--- a/components/autofill/browser/autocomplete_history_manager_unittest.cc
+++ b/components/autofill/browser/autocomplete_history_manager_unittest.cc
@@ -8,8 +8,8 @@
#include "base/prefs/testing_pref_service.h"
#include "base/run_loop.h"
#include "base/string16.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/waitable_event.h"
-#include "base/utf_string_conversions.h"
#include "chrome/browser/webdata/web_data_service_factory.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "chrome/test/base/testing_browser_process.h"
diff --git a/components/autofill/browser/autofill_common_test.cc b/components/autofill/browser/autofill_common_test.cc
index dff3c48..1b9f16d 100644
--- a/components/autofill/browser/autofill_common_test.cc
+++ b/components/autofill/browser/autofill_common_test.cc
@@ -6,7 +6,7 @@
#include "base/guid.h"
#include "base/prefs/pref_service.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/profiles/profile.h"
#include "components/autofill/browser/autofill_profile.h"
#include "components/autofill/browser/credit_card.h"
diff --git a/components/autofill/browser/autofill_country.cc b/components/autofill/browser/autofill_country.cc
index ed42231..60410b7 100644
--- a/components/autofill/browser/autofill_country.cc
+++ b/components/autofill/browser/autofill_country.cc
@@ -14,7 +14,7 @@
#include "base/memory/singleton.h"
#include "base/stl_util.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "grit/component_resources.h"
#include "third_party/icu/public/common/unicode/locid.h"
#include "third_party/icu/public/common/unicode/uloc.h"
diff --git a/components/autofill/browser/autofill_country_unittest.cc b/components/autofill/browser/autofill_country_unittest.cc
index ea326e3..a94cdec 100644
--- a/components/autofill/browser/autofill_country_unittest.cc
+++ b/components/autofill/browser/autofill_country_unittest.cc
@@ -5,7 +5,7 @@
#include <string>
#include "base/string16.h"
-#include "base/utf_string_conversions.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 01c5455..b8d0ad2 100644
--- a/components/autofill/browser/autofill_data_model.cc
+++ b/components/autofill/browser/autofill_data_model.cc
@@ -8,7 +8,7 @@
#include "base/logging.h"
#include "base/string_util.h"
#include "base/strings/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_country.h"
#include "components/autofill/browser/autofill_field.h"
#include "components/autofill/browser/state_names.h"
diff --git a/components/autofill/browser/autofill_download_unittest.cc b/components/autofill/browser/autofill_download_unittest.cc
index 86a0b71..04976b3 100644
--- a/components/autofill/browser/autofill_download_unittest.cc
+++ b/components/autofill/browser/autofill_download_unittest.cc
@@ -6,8 +6,8 @@
#include "base/message_loop.h"
#include "base/string_util.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/test/test_timeouts.h"
-#include "base/utf_string_conversions.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
#include "components/autofill/browser/autofill_download.h"
diff --git a/components/autofill/browser/autofill_external_delegate.cc b/components/autofill/browser/autofill_external_delegate.cc
index 95fc0cf..c262f50 100644
--- a/components/autofill/browser/autofill_external_delegate.cc
+++ b/components/autofill/browser/autofill_external_delegate.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/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autocomplete_history_manager.h"
#include "components/autofill/browser/autofill_external_delegate.h"
#include "components/autofill/browser/autofill_manager.h"
diff --git a/components/autofill/browser/autofill_field.cc b/components/autofill/browser/autofill_field.cc
index 70aeda3..3adf024b 100644
--- a/components/autofill/browser/autofill_field.cc
+++ b/components/autofill/browser/autofill_field.cc
@@ -7,7 +7,7 @@
#include "base/logging.h"
#include "base/sha1.h"
#include "base/strings/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
namespace {
diff --git a/components/autofill/browser/autofill_field_unittest.cc b/components/autofill/browser/autofill_field_unittest.cc
index 250f24d..8dab932 100644
--- a/components/autofill/browser/autofill_field_unittest.cc
+++ b/components/autofill/browser/autofill_field_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_field.h"
#include "components/autofill/browser/field_types.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/autofill_manager.cc b/components/autofill/browser/autofill_manager.cc
index a8ebecd..7a5198b 100644
--- a/components/autofill/browser/autofill_manager.cc
+++ b/components/autofill/browser/autofill_manager.cc
@@ -18,8 +18,8 @@
#include "base/prefs/pref_service.h"
#include "base/string16.h"
#include "base/string_util.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/threading/sequenced_worker_pool.h"
-#include "base/utf_string_conversions.h"
#include "components/autofill/browser/autocheckout/whitelist_manager.h"
#include "components/autofill/browser/autocheckout_manager.h"
#include "components/autofill/browser/autocomplete_history_manager.h"
diff --git a/components/autofill/browser/autofill_manager_unittest.cc b/components/autofill/browser/autofill_manager_unittest.cc
index eb3c782..93b417a 100644
--- a/components/autofill/browser/autofill_manager_unittest.cc
+++ b/components/autofill/browser/autofill_manager_unittest.cc
@@ -13,9 +13,9 @@
#include "base/string16.h"
#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
#include "base/tuple.h"
-#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/personal_data_manager_factory.h"
#include "chrome/browser/password_manager/password_manager.h"
#include "chrome/browser/password_manager/password_manager_delegate_impl.h"
diff --git a/components/autofill/browser/autofill_merge_unittest.cc b/components/autofill/browser/autofill_merge_unittest.cc
index 5b021bd..1925763 100644
--- a/components/autofill/browser/autofill_merge_unittest.cc
+++ b/components/autofill/browser/autofill_merge_unittest.cc
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/files/file_path.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_common_test.h"
#include "components/autofill/browser/autofill_type.h"
#include "components/autofill/browser/data_driven_test.h"
diff --git a/components/autofill/browser/autofill_metrics_unittest.cc b/components/autofill/browser/autofill_metrics_unittest.cc
index d1f2ef8..741317a 100644
--- a/components/autofill/browser/autofill_metrics_unittest.cc
+++ b/components/autofill/browser/autofill_metrics_unittest.cc
@@ -7,8 +7,8 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/string16.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
#include "chrome/browser/autofill/personal_data_manager_factory.h"
#include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
diff --git a/components/autofill/browser/autofill_profile.cc b/components/autofill/browser/autofill_profile.cc
index 8c5c18f..976cee9 100644
--- a/components/autofill/browser/autofill_profile.cc
+++ b/components/autofill/browser/autofill_profile.cc
@@ -14,7 +14,7 @@
#include "base/guid.h"
#include "base/logging.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/address.h"
#include "components/autofill/browser/autofill_country.h"
#include "components/autofill/browser/autofill_field.h"
diff --git a/components/autofill/browser/autofill_profile_unittest.cc b/components/autofill/browser/autofill_profile_unittest.cc
index b3a9199..5d6dfff 100644
--- a/components/autofill/browser/autofill_profile_unittest.cc
+++ b/components/autofill/browser/autofill_profile_unittest.cc
@@ -9,7 +9,7 @@
#include "base/stl_util.h"
#include "base/string16.h"
#include "base/stringprintf.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_common_test.h"
#include "components/autofill/browser/autofill_profile.h"
#include "components/autofill/common/form_field_data.h"
diff --git a/components/autofill/browser/autofill_regexes_unittest.cc b/components/autofill/browser/autofill_regexes_unittest.cc
index fe6a6b3..cec6247 100644
--- a/components/autofill/browser/autofill_regexes_unittest.cc
+++ b/components/autofill/browser/autofill_regexes_unittest.cc
@@ -5,7 +5,7 @@
#include "components/autofill/browser/autofill_regexes.h"
#include "base/string16.h"
-#include "base/utf_string_conversions.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/contact_info.cc b/components/autofill/browser/contact_info.cc
index a3cdc07..85b7736 100644
--- a/components/autofill/browser/contact_info.cc
+++ b/components/autofill/browser/contact_info.cc
@@ -11,7 +11,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.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_unittest.cc b/components/autofill/browser/contact_info_unittest.cc
index bd85626..659b1571 100644
--- a/components/autofill/browser/contact_info_unittest.cc
+++ b/components/autofill/browser/contact_info_unittest.cc
@@ -6,7 +6,7 @@
#include "base/basictypes.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_type.h"
#include "components/autofill/browser/field_types.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/credit_card.cc b/components/autofill/browser/credit_card.cc
index 92bd9b0..0433231 100644
--- a/components/autofill/browser/credit_card.cc
+++ b/components/autofill/browser/credit_card.cc
@@ -16,7 +16,7 @@
#include "base/string_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_field.h"
#include "components/autofill/browser/autofill_regexes.h"
#include "components/autofill/browser/autofill_type.h"
diff --git a/components/autofill/browser/credit_card_field.cc b/components/autofill/browser/credit_card_field.cc
index 3b7e923..94caf1a 100644
--- a/components/autofill/browser/credit_card_field.cc
+++ b/components/autofill/browser/credit_card_field.cc
@@ -10,7 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/string16.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_field.h"
#include "components/autofill/browser/autofill_regex_constants.h"
#include "components/autofill/browser/autofill_scanner.h"
diff --git a/components/autofill/browser/credit_card_field_unittest.cc b/components/autofill/browser/credit_card_field_unittest.cc
index 92a1cd3..ed1ecd0 100644
--- a/components/autofill/browser/credit_card_field_unittest.cc
+++ b/components/autofill/browser/credit_card_field_unittest.cc
@@ -4,7 +4,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_field.h"
#include "components/autofill/browser/autofill_scanner.h"
#include "components/autofill/browser/credit_card_field.h"
diff --git a/components/autofill/browser/credit_card_unittest.cc b/components/autofill/browser/credit_card_unittest.cc
index ec0b4ed..6d78f33 100644
--- a/components/autofill/browser/credit_card_unittest.cc
+++ b/components/autofill/browser/credit_card_unittest.cc
@@ -4,7 +4,7 @@
#include "base/basictypes.h"
#include "base/guid.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_common_test.h"
#include "components/autofill/browser/credit_card.h"
#include "components/autofill/common/form_field_data.h"
diff --git a/components/autofill/browser/email_field.cc b/components/autofill/browser/email_field.cc
index a24ac178..7b1497a 100644
--- a/components/autofill/browser/email_field.cc
+++ b/components/autofill/browser/email_field.cc
@@ -4,7 +4,7 @@
#include "components/autofill/browser/email_field.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_regex_constants.h"
#include "components/autofill/browser/autofill_scanner.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/components/autofill/browser/form_field.cc b/components/autofill/browser/form_field.cc
index 2887aa2..6424231 100644
--- a/components/autofill/browser/form_field.cc
+++ b/components/autofill/browser/form_field.cc
@@ -12,7 +12,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/address_field.h"
#include "components/autofill/browser/autofill_field.h"
#include "components/autofill/browser/autofill_regexes.h"
diff --git a/components/autofill/browser/form_field_unittest.cc b/components/autofill/browser/form_field_unittest.cc
index 08018e4..a67f420 100644
--- a/components/autofill/browser/form_field_unittest.cc
+++ b/components/autofill/browser/form_field_unittest.cc
@@ -4,7 +4,7 @@
#include "base/memory/scoped_vector.h"
#include "base/string16.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_field.h"
#include "components/autofill/browser/form_field.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/form_structure.cc b/components/autofill/browser/form_structure.cc
index 30d298a..ad903a3 100644
--- a/components/autofill/browser/form_structure.cc
+++ b/components/autofill/browser/form_structure.cc
@@ -14,8 +14,8 @@
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "components/autofill/browser/autocheckout_page_meta_data.h"
#include "components/autofill/browser/autofill_metrics.h"
#include "components/autofill/browser/autofill_type.h"
diff --git a/components/autofill/browser/form_structure_unittest.cc b/components/autofill/browser/form_structure_unittest.cc
index 4c6af54..d47a19c 100644
--- a/components/autofill/browser/form_structure_unittest.cc
+++ b/components/autofill/browser/form_structure_unittest.cc
@@ -6,7 +6,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autocheckout_page_meta_data.h"
#include "components/autofill/browser/autofill_metrics.h"
#include "components/autofill/common/form_data.h"
diff --git a/components/autofill/browser/name_field.cc b/components/autofill/browser/name_field.cc
index a0e8d1a..ee3b021 100644
--- a/components/autofill/browser/name_field.cc
+++ b/components/autofill/browser/name_field.cc
@@ -7,7 +7,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_regex_constants.h"
#include "components/autofill/browser/autofill_scanner.h"
#include "components/autofill/browser/autofill_type.h"
diff --git a/components/autofill/browser/name_field_unittest.cc b/components/autofill/browser/name_field_unittest.cc
index 1dce028..9b576de 100644
--- a/components/autofill/browser/name_field_unittest.cc
+++ b/components/autofill/browser/name_field_unittest.cc
@@ -4,7 +4,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_field.h"
#include "components/autofill/browser/autofill_scanner.h"
#include "components/autofill/browser/name_field.h"
diff --git a/components/autofill/browser/password_autofill_manager_unittest.cc b/components/autofill/browser/password_autofill_manager_unittest.cc
index 7aea70f..15386db 100644
--- a/components/autofill/browser/password_autofill_manager_unittest.cc
+++ b/components/autofill/browser/password_autofill_manager_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/compiler_specific.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/password_autofill_manager.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/personal_data_manager.cc b/components/autofill/browser/personal_data_manager.cc
index 6761db0..a399548 100644
--- a/components/autofill/browser/personal_data_manager.cc
+++ b/components/autofill/browser/personal_data_manager.cc
@@ -13,7 +13,7 @@
#include "base/prefs/pref_service.h"
#include "base/string_util.h"
#include "base/strings/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill-inl.h"
#include "components/autofill/browser/autofill_country.h"
#include "components/autofill/browser/autofill_field.h"
diff --git a/components/autofill/browser/personal_data_manager_unittest.cc b/components/autofill/browser/personal_data_manager_unittest.cc
index 4d53ced..6c20883 100644
--- a/components/autofill/browser/personal_data_manager_unittest.cc
+++ b/components/autofill/browser/personal_data_manager_unittest.cc
@@ -8,8 +8,8 @@
#include "base/guid.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/waitable_event.h"
-#include "base/utf_string_conversions.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
#include "components/autofill/browser/autofill_common_test.h"
diff --git a/components/autofill/browser/phone_field.cc b/components/autofill/browser/phone_field.cc
index e3b527e..073f4a7 100644
--- a/components/autofill/browser/phone_field.cc
+++ b/components/autofill/browser/phone_field.cc
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/string16.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_field.h"
#include "components/autofill/browser/autofill_regex_constants.h"
#include "components/autofill/browser/autofill_scanner.h"
diff --git a/components/autofill/browser/phone_field_unittest.cc b/components/autofill/browser/phone_field_unittest.cc
index 4e0c969..fc416f3 100644
--- a/components/autofill/browser/phone_field_unittest.cc
+++ b/components/autofill/browser/phone_field_unittest.cc
@@ -4,7 +4,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_field.h"
#include "components/autofill/browser/autofill_scanner.h"
#include "components/autofill/browser/phone_field.h"
diff --git a/components/autofill/browser/phone_number.cc b/components/autofill/browser/phone_number.cc
index 34180ac..567aaf1 100644
--- a/components/autofill/browser/phone_number.cc
+++ b/components/autofill/browser/phone_number.cc
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/string_util.h"
#include "base/strings/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_country.h"
#include "components/autofill/browser/autofill_profile.h"
#include "components/autofill/browser/autofill_type.h"
diff --git a/components/autofill/browser/phone_number_i18n.cc b/components/autofill/browser/phone_number_i18n.cc
index eb1814f..9143f73 100644
--- a/components/autofill/browser/phone_number_i18n.cc
+++ b/components/autofill/browser/phone_number_i18n.cc
@@ -9,7 +9,7 @@
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_country.h"
#include "third_party/libphonenumber/src/phonenumber_api.h"
diff --git a/components/autofill/browser/phone_number_i18n_unittest.cc b/components/autofill/browser/phone_number_i18n_unittest.cc
index ddb6868..5901312 100644
--- a/components/autofill/browser/phone_number_i18n_unittest.cc
+++ b/components/autofill/browser/phone_number_i18n_unittest.cc
@@ -4,7 +4,7 @@
#include "base/message_loop.h"
#include "base/string16.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/phone_number_i18n.h"
#include "content/public/test/test_browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/phone_number_unittest.cc b/components/autofill/browser/phone_number_unittest.cc
index 2f561e9..58c4682 100644
--- a/components/autofill/browser/phone_number_unittest.cc
+++ b/components/autofill/browser/phone_number_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/string16.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/autofill_profile.h"
#include "components/autofill/browser/field_types.h"
#include "components/autofill/browser/phone_number.h"
diff --git a/components/autofill/browser/state_names.cc b/components/autofill/browser/state_names.cc
index 3c28ef3..9fca367 100644
--- a/components/autofill/browser/state_names.cc
+++ b/components/autofill/browser/state_names.cc
@@ -6,7 +6,7 @@
#include "base/basictypes.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
namespace autofill {
namespace state_names {
diff --git a/components/autofill/browser/validation.cc b/components/autofill/browser/validation.cc
index 68add10..3875428 100644
--- a/components/autofill/browser/validation.cc
+++ b/components/autofill/browser/validation.cc
@@ -7,8 +7,8 @@
#include "base/string_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "components/autofill/browser/autofill_regexes.h"
#include "components/autofill/browser/credit_card.h"
#include "components/autofill/browser/state_names.h"
diff --git a/components/autofill/browser/validation_unittest.cc b/components/autofill/browser/validation_unittest.cc
index 939917d..eda933e 100644
--- a/components/autofill/browser/validation_unittest.cc
+++ b/components/autofill/browser/validation_unittest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "components/autofill/browser/validation.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/wallet/encryption_escrow_client.cc b/components/autofill/browser/wallet/encryption_escrow_client.cc
index 837949e..f047242 100644
--- a/components/autofill/browser/wallet/encryption_escrow_client.cc
+++ b/components/autofill/browser/wallet/encryption_escrow_client.cc
@@ -9,7 +9,7 @@
#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/browser/wallet/encryption_escrow_client_observer.h"
#include "components/autofill/browser/wallet/instrument.h"
#include "components/autofill/browser/wallet/wallet_service_url.h"
diff --git a/components/autofill/browser/wallet/full_wallet.cc b/components/autofill/browser/wallet/full_wallet.cc
index 14dc605..0b3938e 100644
--- a/components/autofill/browser/wallet/full_wallet.cc
+++ b/components/autofill/browser/wallet/full_wallet.cc
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "components/autofill/browser/credit_card.h"
diff --git a/components/autofill/browser/wallet/full_wallet_unittest.cc b/components/autofill/browser/wallet/full_wallet_unittest.cc
index f262cec..04b97a4 100644
--- a/components/autofill/browser/wallet/full_wallet_unittest.cc
+++ b/components/autofill/browser/wallet/full_wallet_unittest.cc
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "components/autofill/browser/wallet/full_wallet.h"
#include "components/autofill/browser/wallet/required_action.h"
diff --git a/components/autofill/browser/wallet/instrument.cc b/components/autofill/browser/wallet/instrument.cc
index f2ef382..45e2b5b 100644
--- a/components/autofill/browser/wallet/instrument.cc
+++ b/components/autofill/browser/wallet/instrument.cc
@@ -7,7 +7,7 @@
#include "base/logging.h"
#include "base/string_util.h"
#include "base/strings/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "components/autofill/browser/autofill_country.h"
#include "components/autofill/browser/autofill_profile.h"
diff --git a/components/autofill/browser/wallet/instrument_unittest.cc b/components/autofill/browser/wallet/instrument_unittest.cc
index 23bbfa7..231b65e 100644
--- a/components/autofill/browser/wallet/instrument_unittest.cc
+++ b/components/autofill/browser/wallet/instrument_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/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "components/autofill/browser/wallet/instrument.h"
#include "components/autofill/browser/wallet/wallet_address.h"
diff --git a/components/autofill/browser/wallet/wallet_address.cc b/components/autofill/browser/wallet/wallet_address.cc
index 53d6489..7b91183 100644
--- a/components/autofill/browser/wallet/wallet_address.cc
+++ b/components/autofill/browser/wallet/wallet_address.cc
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "components/autofill/browser/autofill_country.h"
#include "components/autofill/browser/autofill_profile.h"
diff --git a/components/autofill/browser/wallet/wallet_address_unittest.cc b/components/autofill/browser/wallet/wallet_address_unittest.cc
index 1fc32d2..d423872 100644
--- a/components/autofill/browser/wallet/wallet_address_unittest.cc
+++ b/components/autofill/browser/wallet/wallet_address_unittest.cc
@@ -5,7 +5,7 @@
#include "base/json/json_reader.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "components/autofill/browser/wallet/wallet_address.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/wallet/wallet_items.cc b/components/autofill/browser/wallet/wallet_items.cc
index 771dd19..89024ad 100644
--- a/components/autofill/browser/wallet/wallet_items.cc
+++ b/components/autofill/browser/wallet/wallet_items.cc
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "components/autofill/browser/autofill_type.h"
#include "components/autofill/browser/credit_card.h"
diff --git a/components/autofill/browser/wallet/wallet_items_unittest.cc b/components/autofill/browser/wallet/wallet_items_unittest.cc
index e4b62ee..bb08914 100644
--- a/components/autofill/browser/wallet/wallet_items_unittest.cc
+++ b/components/autofill/browser/wallet/wallet_items_unittest.cc
@@ -5,7 +5,7 @@
#include "base/json/json_reader.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "components/autofill/browser/wallet/required_action.h"
#include "components/autofill/browser/wallet/wallet_items.h"
diff --git a/components/autofill/browser/wallet/wallet_test_util.cc b/components/autofill/browser/wallet/wallet_test_util.cc
index 7f9d654..be5da10 100644
--- a/components/autofill/browser/wallet/wallet_test_util.cc
+++ b/components/autofill/browser/wallet/wallet_test_util.cc
@@ -8,8 +8,8 @@
#include <vector>
#include "base/string16.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "components/autofill/browser/wallet/full_wallet.h"
#include "components/autofill/browser/wallet/instrument.h"
diff --git a/components/autofill/browser/webdata/autofill_entry.cc b/components/autofill/browser/webdata/autofill_entry.cc
index 6d7d538..1f5ab6b 100644
--- a/components/autofill/browser/webdata/autofill_entry.cc
+++ b/components/autofill/browser/webdata/autofill_entry.cc
@@ -8,7 +8,7 @@
#include <set>
#include "base/logging.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
namespace autofill {
namespace {
diff --git a/components/autofill/browser/webdata/autofill_entry_unittest.cc b/components/autofill/browser/webdata/autofill_entry_unittest.cc
index 4da7a8f..d235547 100644
--- a/components/autofill/browser/webdata/autofill_entry_unittest.cc
+++ b/components/autofill/browser/webdata/autofill_entry_unittest.cc
@@ -4,8 +4,8 @@
#include <algorithm>
+#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "components/autofill/browser/webdata/autofill_entry.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/webdata/autofill_table_unittest.cc b/components/autofill/browser/webdata/autofill_table_unittest.cc
index a7d6ab8..8621eb5 100644
--- a/components/autofill/browser/webdata/autofill_table_unittest.cc
+++ b/components/autofill/browser/webdata/autofill_table_unittest.cc
@@ -10,8 +10,8 @@
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "components/autofill/browser/autofill_profile.h"
#include "components/autofill/browser/autofill_type.h"
#include "components/autofill/browser/credit_card.h"
diff --git a/components/autofill/browser/webdata/web_data_service_unittest.cc b/components/autofill/browser/webdata/web_data_service_unittest.cc
index 98f0313..128ac1c 100644
--- a/components/autofill/browser/webdata/web_data_service_unittest.cc
+++ b/components/autofill/browser/webdata/web_data_service_unittest.cc
@@ -14,9 +14,9 @@
#include "base/stl_util.h"
#include "base/string16.h"
#include "base/string_util.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/waitable_event.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "components/autofill/browser/autofill_country.h"
#include "components/autofill/browser/autofill_profile.h"
#include "components/autofill/browser/credit_card.h"
diff --git a/components/autofill/common/form_field_data.cc b/components/autofill/common/form_field_data.cc
index b6ea38a..c12a135 100644
--- a/components/autofill/common/form_field_data.cc
+++ b/components/autofill/common/form_field_data.cc
@@ -5,7 +5,7 @@
#include "components/autofill/common/form_field_data.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
namespace autofill {
diff --git a/components/autofill/content/browser/risk/fingerprint.cc b/components/autofill/content/browser/risk/fingerprint.cc
index 3472063..631d0e9 100644
--- a/components/autofill/content/browser/risk/fingerprint.cc
+++ b/components/autofill/content/browser/risk/fingerprint.cc
@@ -17,9 +17,9 @@
#include "base/cpu.h"
#include "base/logging.h"
#include "base/strings/string_split.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/sys_info.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "components/autofill/content/browser/risk/proto/fingerprint.pb.h"
#include "content/public/browser/browser_thread.h"
diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc
index be2046d..d68deb1 100644
--- a/components/autofill/content/renderer/autofill_agent.cc
+++ b/components/autofill/content/renderer/autofill_agent.cc
@@ -9,8 +9,8 @@
#include "base/message_loop.h"
#include "base/string_util.h"
#include "base/strings/string_split.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "components/autofill/common/autocheckout_status.h"
#include "components/autofill/common/autofill_constants.h"
#include "components/autofill/common/autofill_messages.h"
diff --git a/components/autofill/content/renderer/form_autofill_util.cc b/components/autofill/content/renderer/form_autofill_util.cc
index 40a20e1..5adb87f 100644
--- a/components/autofill/content/renderer/form_autofill_util.cc
+++ b/components/autofill/content/renderer/form_autofill_util.cc
@@ -11,7 +11,7 @@
#include "base/memory/scoped_vector.h"
#include "base/metrics/field_trial.h"
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/common/autofill_switches.h"
#include "components/autofill/common/form_data.h"
#include "components/autofill/common/form_field_data.h"
diff --git a/components/autofill/content/renderer/form_cache.cc b/components/autofill/content/renderer/form_cache.cc
index f43413c..6e2aad1 100644
--- a/components/autofill/content/renderer/form_cache.cc
+++ b/components/autofill/content/renderer/form_cache.cc
@@ -5,7 +5,7 @@
#include "components/autofill/content/renderer/form_cache.h"
#include "base/logging.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/autofill/common/autofill_constants.h"
#include "components/autofill/common/form_data.h"
#include "components/autofill/common/form_data_predictions.h"
diff --git a/components/sessions/serialized_navigation_entry.cc b/components/sessions/serialized_navigation_entry.cc
index fba0d3a..5e4183c 100644
--- a/components/sessions/serialized_navigation_entry.cc
+++ b/components/sessions/serialized_navigation_entry.cc
@@ -5,7 +5,7 @@
#include "components/sessions/serialized_navigation_entry.h"
#include "base/pickle.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "content/public/browser/favicon_status.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
diff --git a/components/sessions/serialized_navigation_entry_test_helper.cc b/components/sessions/serialized_navigation_entry_test_helper.cc
index 00d7925..b373a84 100644
--- a/components/sessions/serialized_navigation_entry_test_helper.cc
+++ b/components/sessions/serialized_navigation_entry_test_helper.cc
@@ -4,8 +4,8 @@
#include "components/sessions/serialized_navigation_entry_test_helper.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "components/sessions/serialized_navigation_entry.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/sessions/serialized_navigation_entry_unittest.cc b/components/sessions/serialized_navigation_entry_unittest.cc
index 0a2453a..cb4598c 100644
--- a/components/sessions/serialized_navigation_entry_unittest.cc
+++ b/components/sessions/serialized_navigation_entry_unittest.cc
@@ -12,8 +12,8 @@
#include "base/pickle.h"
#include "base/string16.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "content/public/browser/favicon_status.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/common/page_transition_types.h"
diff --git a/components/webdata/common/web_database_migration_unittest.cc b/components/webdata/common/web_database_migration_unittest.cc
index e005089..dbd18cf 100644
--- a/components/webdata/common/web_database_migration_unittest.cc
+++ b/components/webdata/common/web_database_migration_unittest.cc
@@ -11,8 +11,8 @@
#include "base/stl_util.h"
#include "base/string16.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/webdata/keyword_table.h"
#include "chrome/browser/webdata/logins_table.h"
diff --git a/components/webdata/encryptor/encryptor_mac.mm b/components/webdata/encryptor/encryptor_mac.mm
index e402578..089bf6c 100644
--- a/components/webdata/encryptor/encryptor_mac.mm
+++ b/components/webdata/encryptor/encryptor_mac.mm
@@ -8,7 +8,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "components/webdata/encryptor/encryptor_password_mac.h"
#include "crypto/apple_keychain.h"
#include "crypto/encryptor.h"
diff --git a/components/webdata/encryptor/encryptor_posix.cc b/components/webdata/encryptor/encryptor_posix.cc
index ef730a4..ae16af5 100644
--- a/components/webdata/encryptor/encryptor_posix.cc
+++ b/components/webdata/encryptor/encryptor_posix.cc
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "crypto/encryptor.h"
#include "crypto/symmetric_key.h"
diff --git a/components/webdata/encryptor/encryptor_unittest.cc b/components/webdata/encryptor/encryptor_unittest.cc
index 6d166bd..dcc6bb7 100644
--- a/components/webdata/encryptor/encryptor_unittest.cc
+++ b/components/webdata/encryptor/encryptor_unittest.cc
@@ -7,7 +7,7 @@
#include <string>
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/components/webdata/encryptor/encryptor_win.cc b/components/webdata/encryptor/encryptor_win.cc
index 3ad36f6..adf792f 100644
--- a/components/webdata/encryptor/encryptor_win.cc
+++ b/components/webdata/encryptor/encryptor_win.cc
@@ -6,7 +6,7 @@
#include <windows.h>
#include <wincrypt.h>
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#pragma comment(lib, "crypt32.lib")