diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-08 22:38:41 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-08 22:38:41 +0000 |
| commit | 3ea1b18715919a522c6711e5ca5f2fd40e485850 (patch) | |
| tree | e17d17820edba1ce729fbe9948a23b498bfe1286 /chrome/browser | |
| parent | 5ffc16b6a8ab99e5470cd23645fd3a12a04c6a0e (diff) | |
| download | chromium_src-3ea1b18715919a522c6711e5ca5f2fd40e485850.zip chromium_src-3ea1b18715919a522c6711e5ca5f2fd40e485850.tar.gz chromium_src-3ea1b18715919a522c6711e5ca5f2fd40e485850.tar.bz2 | |
Rename FilePath to base::FilePath and use new location of string_number_conversions in some chrome subdirectories.
Review URL: https://codereview.chromium.org/12218065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
370 files changed, 488 insertions, 404 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 7e9cd1f..e9e613d 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -11,7 +11,7 @@ #include "base/command_line.h" #include "base/memory/singleton.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "cc/switches.h" diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc index 79322c9..ff95775 100644 --- a/chrome/browser/about_flags_unittest.cc +++ b/chrome/browser/about_flags_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_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/about_flags.h" diff --git a/chrome/browser/accessibility/accessibility_extension_api.cc b/chrome/browser/accessibility/accessibility_extension_api.cc index 3a22840..efd4ec4 100644 --- a/chrome/browser/accessibility/accessibility_extension_api.cc +++ b/chrome/browser/accessibility/accessibility_extension_api.cc @@ -5,7 +5,7 @@ #include "chrome/browser/accessibility/accessibility_extension_api.h" #include "base/json/json_writer.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/accessibility/accessibility_extension_api_constants.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index d374716..6e23eae 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -11,7 +11,7 @@ #include "base/mac/foundation_util.h" #include "base/mac/mac_util.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/autocomplete/autocomplete_controller.cc b/chrome/browser/autocomplete/autocomplete_controller.cc index fd59b7e..42a839a 100644 --- a/chrome/browser/autocomplete/autocomplete_controller.cc +++ b/chrome/browser/autocomplete/autocomplete_controller.cc @@ -11,8 +11,8 @@ #include "base/format_macros.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h" #include "chrome/browser/autocomplete/bookmark_provider.h" diff --git a/chrome/browser/autocomplete/autocomplete_field_trial.cc b/chrome/browser/autocomplete/autocomplete_field_trial.cc index 08e5410..0c6c2a5 100644 --- a/chrome/browser/autocomplete/autocomplete_field_trial.cc +++ b/chrome/browser/autocomplete/autocomplete_field_trial.cc @@ -7,8 +7,8 @@ #include <string> #include "base/metrics/field_trial.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "chrome/common/metrics/metrics_util.h" #include "chrome/common/metrics/variations/variation_ids.h" #include "chrome/common/metrics/variations/variations_util.h" diff --git a/chrome/browser/autocomplete/autocomplete_match.cc b/chrome/browser/autocomplete/autocomplete_match.cc index e3b9d13..7de2ec1 100644 --- a/chrome/browser/autocomplete/autocomplete_match.cc +++ b/chrome/browser/autocomplete/autocomplete_match.cc @@ -6,10 +6,10 @@ #include "base/i18n/time_formatting.h" #include "base/logging.h" -#include "base/string_number_conversions.h" -#include "base/string_util.h" #include "base/string16.h" +#include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_provider.h" diff --git a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc index fe4be82..b7c36ab 100644 --- a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc @@ -8,8 +8,8 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_controller.h" #include "chrome/browser/autocomplete/autocomplete_input.h" diff --git a/chrome/browser/autocomplete/autocomplete_result_unittest.cc b/chrome/browser/autocomplete/autocomplete_result_unittest.cc index 65d4cc4..64b0b70 100644 --- a/chrome/browser/autocomplete/autocomplete_result_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_result_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/autocomplete/autocomplete_result.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/autocomplete/autocomplete_match.h" diff --git a/chrome/browser/autocomplete/bookmark_provider_unittest.cc b/chrome/browser/autocomplete/bookmark_provider_unittest.cc index 1bbc2a2..821f9a7 100644 --- a/chrome/browser/autocomplete/bookmark_provider_unittest.cc +++ b/chrome/browser/autocomplete/bookmark_provider_unittest.cc @@ -11,7 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_provider.h" #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" diff --git a/chrome/browser/autocomplete/contact_provider_chromeos_unittest.cc b/chrome/browser/autocomplete/contact_provider_chromeos_unittest.cc index d6a9206..0a4a3b9 100644 --- a/chrome/browser/autocomplete/contact_provider_chromeos_unittest.cc +++ b/chrome/browser/autocomplete/contact_provider_chromeos_unittest.cc @@ -11,8 +11,8 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" #include "base/string16.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/autocomplete/autocomplete_match.h" diff --git a/chrome/browser/autocomplete/history_quick_provider.cc b/chrome/browser/autocomplete/history_quick_provider.cc index b26a153..1eb1acc 100644 --- a/chrome/browser/autocomplete/history_quick_provider.cc +++ b/chrome/browser/autocomplete/history_quick_provider.cc @@ -12,8 +12,8 @@ #include "base/logging.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_field_trial.h" diff --git a/chrome/browser/autocomplete/shortcuts_provider.cc b/chrome/browser/autocomplete/shortcuts_provider.cc index fd18a15..43b14d1 100644 --- a/chrome/browser/autocomplete/shortcuts_provider.cc +++ b/chrome/browser/autocomplete/shortcuts_provider.cc @@ -13,8 +13,8 @@ #include "base/i18n/case_conversion.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_input.h" diff --git a/chrome/browser/autofill/autocomplete_history_manager.cc b/chrome/browser/autofill/autocomplete_history_manager.cc index 8785050..99ee0ec 100644 --- a/chrome/browser/autofill/autocomplete_history_manager.cc +++ b/chrome/browser/autofill/autocomplete_history_manager.cc @@ -8,7 +8,7 @@ #include "base/prefs/public/pref_service_base.h" #include "base/string16.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_external_delegate.h" #include "chrome/browser/autofill/validation.h" diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index 4f8c107..908fa6b 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -10,8 +10,8 @@ #include "base/memory/scoped_ptr.h" #include "base/rand_util.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" diff --git a/chrome/browser/autofill/autofill_field.cc b/chrome/browser/autofill/autofill_field.cc index 974af94..49d2c8b 100644 --- a/chrome/browser/autofill/autofill_field.cc +++ b/chrome/browser/autofill/autofill_field.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/sha1.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" namespace { diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc index 641b379..45f7ed0 100644 --- a/chrome/browser/autofill/autofill_manager_unittest.cc +++ b/chrome/browser/autofill/autofill_manager_unittest.cc @@ -10,8 +10,8 @@ #include "base/memory/scoped_vector.h" #include "base/prefs/public/pref_service_base.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/tuple.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/autofill/autofill_xml_parser_unittest.cc b/chrome/browser/autofill/autofill_xml_parser_unittest.cc index 19cca97..649eb09 100644 --- a/chrome/browser/autofill/autofill_xml_parser_unittest.cc +++ b/chrome/browser/autofill/autofill_xml_parser_unittest.cc @@ -6,7 +6,7 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/autofill/autofill_xml_parser.h" #include "chrome/browser/autofill/field_types.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/autofill/credit_card.cc b/chrome/browser/autofill/credit_card.cc index 395aec5..abfd7ea 100644 --- a/chrome/browser/autofill/credit_card.cc +++ b/chrome/browser/autofill/credit_card.cc @@ -13,9 +13,9 @@ #include "base/guid.h" #include "base/logging.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_country.h" #include "chrome/browser/autofill/autofill_field.h" diff --git a/chrome/browser/autofill/form_group.cc b/chrome/browser/autofill/form_group.cc index 42dd19c6a..f52e676 100644 --- a/chrome/browser/autofill/form_group.cc +++ b/chrome/browser/autofill/form_group.cc @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_country.h" #include "chrome/common/form_field_data.h" diff --git a/chrome/browser/autofill/form_structure.cc b/chrome/browser/autofill/form_structure.cc index 4f11055..ce44885 100644 --- a/chrome/browser/autofill/form_structure.cc +++ b/chrome/browser/autofill/form_structure.cc @@ -11,9 +11,9 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/sha1.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autocheckout_page_meta_data.h" diff --git a/chrome/browser/autofill/personal_data_manager.cc b/chrome/browser/autofill/personal_data_manager.cc index 9bdd8e8..df49ded 100644 --- a/chrome/browser/autofill/personal_data_manager.cc +++ b/chrome/browser/autofill/personal_data_manager.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/prefs/public/pref_service_base.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/api/sync/profile_sync_service_base.h" #include "chrome/browser/api/webdata/autofill_web_data_service.h" diff --git a/chrome/browser/autofill/phone_number.cc b/chrome/browser/autofill/phone_number.cc index 5fe7665..8968d3e 100644 --- a/chrome/browser/autofill/phone_number.cc +++ b/chrome/browser/autofill/phone_number.cc @@ -5,8 +5,8 @@ #include "chrome/browser/autofill/phone_number.h" #include "base/basictypes.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_country.h" #include "chrome/browser/autofill/autofill_profile.h" diff --git a/chrome/browser/autofill/phone_number_i18n.cc b/chrome/browser/autofill/phone_number_i18n.cc index 31ad713..7ddd0e0 100644 --- a/chrome/browser/autofill/phone_number_i18n.cc +++ b/chrome/browser/autofill/phone_number_i18n.cc @@ -6,9 +6,9 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/stringprintf.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_country.h" #include "third_party/libphonenumber/src/phonenumber_api.h" diff --git a/chrome/browser/autofill/wallet/full_wallet.cc b/chrome/browser/autofill/wallet/full_wallet.cc index 6fd5e23..9217727 100644 --- a/chrome/browser/autofill/wallet/full_wallet.cc +++ b/chrome/browser/autofill/wallet/full_wallet.cc @@ -5,7 +5,7 @@ #include "chrome/browser/autofill/wallet/full_wallet.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" namespace { diff --git a/chrome/browser/autofill/wallet/wallet_client.cc b/chrome/browser/autofill/wallet/wallet_client.cc index 7b2e98d..2197826 100644 --- a/chrome/browser/autofill/wallet/wallet_client.cc +++ b/chrome/browser/autofill/wallet/wallet_client.cc @@ -8,9 +8,9 @@ #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/autofill/wallet/cart.h" #include "chrome/browser/autofill/wallet/full_wallet.h" diff --git a/chrome/browser/autofill/wallet/wallet_client_unittest.cc b/chrome/browser/autofill/wallet/wallet_client_unittest.cc index e0b8cb1..470caa1 100644 --- a/chrome/browser/autofill/wallet/wallet_client_unittest.cc +++ b/chrome/browser/autofill/wallet/wallet_client_unittest.cc @@ -4,8 +4,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/autofill/wallet/cart.h" #include "chrome/browser/autofill/wallet/full_wallet.h" #include "chrome/browser/autofill/wallet/instrument.h" diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 9dfc06f..b519f11 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -19,8 +19,8 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index ffb002b..9dcccb8 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -16,9 +16,9 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc index 5d3c9d5..b844bac 100644 --- a/chrome/browser/automation/automation_util.cc +++ b/chrome/browser/automation/automation_util.cc @@ -10,8 +10,8 @@ #include "ash/shell_delegate.h" #include "base/bind.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/time.h" #include "base/values.h" diff --git a/chrome/browser/automation/chrome_frame_automation_provider.cc b/chrome/browser/automation/chrome_frame_automation_provider.cc index 1b38c51..5f8127d 100644 --- a/chrome/browser/automation/chrome_frame_automation_provider.cc +++ b/chrome/browser/automation/chrome_frame_automation_provider.cc @@ -7,14 +7,14 @@ #include <algorithm> #include "base/command_line.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/automation_messages.h" #include "chrome/common/chrome_switches.h" -#include "ipc/ipc_message.h" #include "ipc/ipc_channel.h" +#include "ipc/ipc_message.h" const int kMaxChromeShutdownDelaySeconds = 60*60; diff --git a/chrome/browser/bookmarks/bookmark_codec.cc b/chrome/browser/bookmarks/bookmark_codec.cc index b2fead9..4455744 100644 --- a/chrome/browser/bookmarks/bookmark_codec.cc +++ b/chrome/browser/bookmarks/bookmark_codec.cc @@ -6,8 +6,8 @@ #include <algorithm> -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc b/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc index 194e6951..afec124 100644 --- a/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc +++ b/chrome/browser/bookmarks/bookmark_expanded_state_tracker.cc @@ -5,7 +5,7 @@ #include "chrome/browser/bookmarks/bookmark_expanded_state_tracker.h" #include "base/prefs/public/pref_service_base.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc index a855279..58a8071 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/platform_file.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_codec.h" diff --git a/chrome/browser/bookmarks/bookmark_index_unittest.cc b/chrome/browser/bookmarks/bookmark_index_unittest.cc index 76f75cc..2b1e8a7 100644 --- a/chrome/browser/bookmarks/bookmark_index_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_index_unittest.cc @@ -6,9 +6,9 @@ #include <vector> #include "base/message_loop.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_index.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc index 59741be..cc1939c 100644 --- a/chrome/browser/bookmarks/bookmark_model_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc @@ -15,9 +15,9 @@ #include "base/hash_tables.h" #include "base/path_service.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index e473b43..6a94b1e 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -14,8 +14,8 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" diff --git a/chrome/browser/captive_portal/captive_portal_detector.cc b/chrome/browser/captive_portal/captive_portal_detector.cc index 3db7f6e..e1bb561 100644 --- a/chrome/browser/captive_portal/captive_portal_detector.cc +++ b/chrome/browser/captive_portal/captive_portal_detector.cc @@ -5,7 +5,7 @@ #include "chrome/browser/captive_portal/captive_portal_detector.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/profiles/profile.h" #include "net/base/load_flags.h" #include "net/http/http_response_headers.h" diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc index 5d35cc0..d744285 100644 --- a/chrome/browser/chrome_browser_field_trials.cc +++ b/chrome/browser/chrome_browser_field_trials.cc @@ -8,9 +8,9 @@ #include "base/command_line.h" #include "base/metrics/field_trial.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/auto_launch_trial.h" diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index ea31b76..c8ba8c9 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -25,9 +25,9 @@ #include "base/process_info.h" #include "base/process_util.h" #include "base/run_loop.h" -#include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/string_split.h" +#include "base/strings/string_number_conversions.h" #include "base/sys_info.h" #include "base/sys_string_conversions.h" #include "base/threading/platform_thread.h" diff --git a/chrome/browser/chrome_browser_main_posix.cc b/chrome/browser/chrome_browser_main_posix.cc index 9c712d2..1893b39 100644 --- a/chrome/browser/chrome_browser_main_posix.cc +++ b/chrome/browser/chrome_browser_main_posix.cc @@ -17,7 +17,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/sessions/session_restore.h" #include "chrome/common/chrome_notification_types.h" @@ -28,8 +28,8 @@ #include "content/public/browser/notification_service.h" #if defined(TOOLKIT_GTK) -#include "chrome/browser/ui/gtk/chrome_browser_main_extra_parts_gtk.h" #include "chrome/browser/printing/print_dialog_gtk.h" +#include "chrome/browser/ui/gtk/chrome_browser_main_extra_parts_gtk.h" #endif using content::BrowserThread; diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc index 69f9f0e..f8a48a5 100644 --- a/chrome/browser/chrome_browser_main_win.cc +++ b/chrome/browser/chrome_browser_main_win.cc @@ -16,7 +16,7 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/scoped_native_library.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/win/metro.h" #include "base/win/text_services_message_filter.h" diff --git a/chrome/browser/chromeos/boot_times_loader.cc b/chrome/browser/chromeos/boot_times_loader.cc index 24f7bcf..027d722 100644 --- a/chrome/browser/chromeos/boot_times_loader.cc +++ b/chrome/browser/chromeos/boot_times_loader.cc @@ -16,9 +16,9 @@ #include "base/message_loop_proxy.h" #include "base/metrics/histogram.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc index 02e4b8e..2636cf9 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc @@ -16,8 +16,8 @@ #include "base/lazy_instance.h" #include "base/linux_util.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/accessibility/accessibility_util.h" #include "chrome/browser/chromeos/accessibility/magnification_manager.h" diff --git a/chrome/browser/chromeos/contacts/contact_test_util.cc b/chrome/browser/chromeos/contacts/contact_test_util.cc index 73c047f..455dc6c 100644 --- a/chrome/browser/chromeos/contacts/contact_test_util.cc +++ b/chrome/browser/chromeos/contacts/contact_test_util.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/logging.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "chrome/browser/chromeos/contacts/contact_map.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/chromeos/cros/cert_library.cc b/chrome/browser/chromeos/cros/cert_library.cc index 6adc3e8..985f913 100644 --- a/chrome/browser/chromeos/cros/cert_library.cc +++ b/chrome/browser/chromeos/cros/cert_library.cc @@ -10,8 +10,8 @@ #include "base/command_line.h" #include "base/memory/weak_ptr.h" #include "base/observer_list_threadsafe.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" // g_browser_process #include "chrome/browser/chromeos/cros/cros_library.h" diff --git a/chrome/browser/chromeos/cros/cryptohome_library.cc b/chrome/browser/chromeos/cros/cryptohome_library.cc index f453832..9026511 100644 --- a/chrome/browser/chromeos/cros/cryptohome_library.cc +++ b/chrome/browser/chromeos/cros/cryptohome_library.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/memory/weak_ptr.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "chromeos/dbus/cryptohome_client.h" #include "chromeos/dbus/dbus_thread_manager.h" diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index b5ef2ed..2a120c0 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -8,9 +8,8 @@ #include "base/i18n/icu_string_conversions.h" #include "base/i18n/time_formatting.h" #include "base/json/json_writer.h" // for debug output only. -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversion_utils.h" -#include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/certificate_pattern.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/native_network_constants.h" diff --git a/chrome/browser/chromeos/display/display_preferences.cc b/chrome/browser/chromeos/display/display_preferences.cc index 6515d32..abcb42c 100644 --- a/chrome/browser/chromeos/display/display_preferences.cc +++ b/chrome/browser/chromeos/display/display_preferences.cc @@ -8,8 +8,8 @@ #include "ash/display/display_manager.h" #include "ash/shell.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/user_manager.h" diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc index bfdf871..ac03659 100644 --- a/chrome/browser/chromeos/display/display_preferences_unittest.cc +++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc @@ -8,7 +8,7 @@ #include "ash/screen_ash.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/login/mock_user_manager.h" #include "chrome/browser/chromeos/login/user_manager.h" diff --git a/chrome/browser/chromeos/drive/drive_file_system_util.cc b/chrome/browser/chromeos/drive/drive_file_system_util.cc index bd4512c5..94f492b 100644 --- a/chrome/browser/chromeos/drive/drive_file_system_util.cc +++ b/chrome/browser/chromeos/drive/drive_file_system_util.cc @@ -5,8 +5,8 @@ #include "chrome/browser/chromeos/drive/drive_file_system_util.h" #include <string> -#include <vector> #include <utility> +#include <vector> #include "base/basictypes.h" #include "base/bind.h" @@ -16,9 +16,9 @@ #include "base/json/json_reader.h" #include "base/logging.h" #include "base/message_loop_proxy.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_cache.h" #include "chrome/browser/chromeos/drive/drive_file_system_interface.h" diff --git a/chrome/browser/chromeos/drive/drive_protocol_handler.cc b/chrome/browser/chromeos/drive/drive_protocol_handler.cc index 6366339b..4f224a4 100644 --- a/chrome/browser/chromeos/drive/drive_protocol_handler.cc +++ b/chrome/browser/chromeos/drive/drive_protocol_handler.cc @@ -13,8 +13,8 @@ #include "base/file_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/chromeos/drive/drive_resource_metadata.cc b/chrome/browser/chromeos/drive/drive_resource_metadata.cc index e0d929a..a952cf8 100644 --- a/chrome/browser/chromeos/drive/drive_resource_metadata.cc +++ b/chrome/browser/chromeos/drive/drive_resource_metadata.cc @@ -9,7 +9,7 @@ #include "base/message_loop_proxy.h" #include "base/sequenced_task_runner.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/tracked_objects.h" #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_files.h" diff --git a/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc index 588d027..76080a0 100644 --- a/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_resource_metadata_unittest.cc @@ -11,7 +11,7 @@ #include "base/message_loop.h" #include "base/sequenced_task_runner.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_cache.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_handler.cc b/chrome/browser/chromeos/extensions/file_browser_handler.cc index 3f70830..59b23bd 100644 --- a/chrome/browser/chromeos/extensions/file_browser_handler.cc +++ b/chrome/browser/chromeos/extensions/file_browser_handler.cc @@ -5,8 +5,8 @@ #include "chrome/browser/chromeos/extensions/file_browser_handler.h" #include "base/logging.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/extension_constants.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_manifest_unittest.cc b/chrome/browser/chromeos/extensions/file_browser_manifest_unittest.cc index 2cb936a..b86e698 100644 --- a/chrome/browser/chromeos/extensions/file_browser_manifest_unittest.cc +++ b/chrome/browser/chromeos/extensions/file_browser_manifest_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_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/chromeos/extensions/file_browser_handler.h" #include "chrome/common/extensions/extension_builder.h" #include "chrome/common/extensions/extension_manifest_constants.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_notifications.cc b/chrome/browser/chromeos/extensions/file_browser_notifications.cc index 0f70b2d..fe407dc 100644 --- a/chrome/browser/chromeos/extensions/file_browser_notifications.cc +++ b/chrome/browser/chromeos/extensions/file_browser_notifications.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/message_loop.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/notification_delegate.h" diff --git a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc index 6077cc1..c302378 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/chromeos/input_method/ibus_keymap.h" #include "chrome/browser/chromeos/input_method/input_method_configuration.h" #include "chrome/browser/chromeos/input_method/input_method_manager.h" diff --git a/chrome/browser/chromeos/login/default_user_images.cc b/chrome/browser/chromeos/login/default_user_images.cc index 4961c38..d2b395b 100644 --- a/chrome/browser/chromeos/login/default_user_images.cc +++ b/chrome/browser/chromeos/login/default_user_images.cc @@ -6,14 +6,14 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/parallel_authenticator.cc b/chrome/browser/chromeos/login/parallel_authenticator.cc index 9ffd665..011650c 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator.cc +++ b/chrome/browser/chromeos/login/parallel_authenticator.cc @@ -9,8 +9,8 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/chromeos/boot_times_loader.h" #include "chrome/browser/chromeos/cros/cert_library.h" #include "chrome/browser/chromeos/cros/cros_library.h" diff --git a/chrome/browser/chromeos/login/wallpaper_manager.cc b/chrome/browser/chromeos/login/wallpaper_manager.cc index d8351d2..28a1df0 100644 --- a/chrome/browser/chromeos/login/wallpaper_manager.cc +++ b/chrome/browser/chromeos/login/wallpaper_manager.cc @@ -13,9 +13,9 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/worker_pool.h" #include "base/time.h" #include "base/values.h" diff --git a/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc index c70559b..ea4c5e7 100644 --- a/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc +++ b/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc @@ -12,7 +12,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/values.h" #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" diff --git a/chrome/browser/chromeos/memory/oom_priority_manager.cc b/chrome/browser/chromeos/memory/oom_priority_manager.cc index 0cf5999..6cae3ea 100644 --- a/chrome/browser/chromeos/memory/oom_priority_manager.cc +++ b/chrome/browser/chromeos/memory/oom_priority_manager.cc @@ -16,8 +16,8 @@ #include "base/process.h" #include "base/process_util.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/synchronization/lock.h" #include "base/threading/thread.h" #include "base/time.h" diff --git a/chrome/browser/chromeos/net/onc_utils_unittest.cc b/chrome/browser/chromeos/net/onc_utils_unittest.cc index 9d0de2d..90e1106 100644 --- a/chrome/browser/chromeos/net/onc_utils_unittest.cc +++ b/chrome/browser/chromeos/net/onc_utils_unittest.cc @@ -7,7 +7,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/cros/network_ui_data.h" #include "chrome/browser/google_apis/test_util.h" diff --git a/chrome/browser/chromeos/network_message_observer.cc b/chrome/browser/chromeos/network_message_observer.cc index 784ed1fb..1c6e8b1 100644 --- a/chrome/browser/chromeos/network_message_observer.cc +++ b/chrome/browser/chromeos/network_message_observer.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" diff --git a/chrome/browser/chromeos/power/session_length_limiter_unittest.cc b/chrome/browser/chromeos/power/session_length_limiter_unittest.cc index 7eec370..40a86bd 100644 --- a/chrome/browser/chromeos/power/session_length_limiter_unittest.cc +++ b/chrome/browser/chromeos/power/session_length_limiter_unittest.cc @@ -14,7 +14,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/single_thread_task_runner.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/thread_task_runner_handle.h" #include "base/time.h" #include "base/values.h" diff --git a/chrome/browser/chromeos/system/drm_settings.cc b/chrome/browser/chromeos/system/drm_settings.cc index 1b83806..d290859 100644 --- a/chrome/browser/chromeos/system/drm_settings.cc +++ b/chrome/browser/chromeos/system/drm_settings.cc @@ -10,8 +10,8 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/cryptohome_library.h" #include "chrome/browser/chromeos/login/user_manager.h" diff --git a/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc b/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc index ce5df10..3ef089f 100644 --- a/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc +++ b/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc @@ -7,8 +7,8 @@ #include "ash/shell.h" #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" -#include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" #include "chrome/browser/ui/browser_list.h" diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc index 2175108..8d939a4 100644 --- a/chrome/browser/chromeos/web_socket_proxy.cc +++ b/chrome/browser/chromeos/web_socket_proxy.cc @@ -35,8 +35,8 @@ #include "base/sequenced_task_runner_helpers.h" #include "base/sha1.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/sys_byteorder.h" #include "chrome/browser/chromeos/web_socket_proxy_helper.h" #include "chrome/browser/internal_auth.h" diff --git a/chrome/browser/chromeos/web_socket_proxy_helper.cc b/chrome/browser/chromeos/web_socket_proxy_helper.cc index 8b7b6a9..c9f9f0a 100644 --- a/chrome/browser/chromeos/web_socket_proxy_helper.cc +++ b/chrome/browser/chromeos/web_socket_proxy_helper.cc @@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/web_socket_proxy_helper.h" -#include "base/string_number_conversions.h" #include "base/logging.h" +#include "base/strings/string_number_conversions.h" namespace chromeos { diff --git a/chrome/browser/chromeos/web_socket_proxy_helper_unittest.cc b/chrome/browser/chromeos/web_socket_proxy_helper_unittest.cc index 450cde2..985616e 100644 --- a/chrome/browser/chromeos/web_socket_proxy_helper_unittest.cc +++ b/chrome/browser/chromeos/web_socket_proxy_helper_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include <vector> -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/chromeos/web_socket_proxy_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/component_updater/component_unpacker.cc b/chrome/browser/component_updater/component_unpacker.cc index 219921b..680a296 100644 --- a/chrome/browser/component_updater/component_unpacker.cc +++ b/chrome/browser/component_updater/component_unpacker.cc @@ -10,8 +10,8 @@ #include "base/file_util.h" #include "base/json/json_file_value_serializer.h" #include "base/memory/scoped_handle.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/component_updater/component_updater_service.h" #include "chrome/browser/extensions/crx_file.h" #include "chrome/common/extensions/extension_constants.h" diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc index ed3d075..f1ee355 100644 --- a/chrome/browser/component_updater/component_updater_service.cc +++ b/chrome/browser/component_updater/component_updater_service.cc @@ -14,10 +14,10 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/timer.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/component_updater/component_unpacker.h" diff --git a/chrome/browser/crash_upload_list.cc b/chrome/browser/crash_upload_list.cc index 264cfb9..01516d0 100644 --- a/chrome/browser/crash_upload_list.cc +++ b/chrome/browser/crash_upload_list.cc @@ -11,8 +11,8 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/strings/string_number_conversions.h" #if defined(OS_WIN) #include "chrome/browser/crash_upload_list_win.h" #endif diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc index 4878323..f1f73c1 100644 --- a/chrome/browser/devtools/devtools_window.cc +++ b/chrome/browser/devtools/devtools_window.cc @@ -7,8 +7,8 @@ #include "base/command_line.h" #include "base/json/json_writer.h" #include "base/lazy_instance.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/diagnostics/recon_diagnostics.cc b/chrome/browser/diagnostics/recon_diagnostics.cc index 2e67f03..3278eff 100644 --- a/chrome/browser/diagnostics/recon_diagnostics.cc +++ b/chrome/browser/diagnostics/recon_diagnostics.cc @@ -9,12 +9,12 @@ #include "base/file_util.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" -#include "base/stringprintf.h" -#include "base/string_number_conversions.h" +#include "base/path_service.h" #include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/sys_info.h" -#include "base/path_service.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/diagnostics/diagnostics_test.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/diagnostics/sqlite_diagnostics.cc b/chrome/browser/diagnostics/sqlite_diagnostics.cc index 3333ee3..406b7b49 100644 --- a/chrome/browser/diagnostics/sqlite_diagnostics.cc +++ b/chrome/browser/diagnostics/sqlite_diagnostics.cc @@ -9,7 +9,7 @@ #include "base/memory/singleton.h" #include "base/metrics/histogram.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/download/download_status_updater_win.cc b/chrome/browser/download/download_status_updater_win.cc index c28cb1a..921a132 100644 --- a/chrome/browser/download/download_status_updater_win.cc +++ b/chrome/browser/download/download_status_updater_win.cc @@ -4,13 +4,13 @@ #include "chrome/browser/download/download_status_updater.h" -#include <string> #include <shobjidl.h> +#include <string> #include "base/file_path.h" #include "base/logging.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/win/metro.h" #include "base/win/scoped_comptr.h" #include "base/win/windows_version.h" diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 26a05a5..5dfbc92 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -18,7 +18,7 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/string16.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/sys_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/enumerate_modules_model_unittest_win.cc b/chrome/browser/enumerate_modules_model_unittest_win.cc index 1992e7a..b7a0e0d 100644 --- a/chrome/browser/enumerate_modules_model_unittest_win.cc +++ b/chrome/browser/enumerate_modules_model_unittest_win.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/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/enumerate_modules_model_win.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc index a250a8c..b5234a7 100644 --- a/chrome/browser/enumerate_modules_model_win.cc +++ b/chrome/browser/enumerate_modules_model_win.cc @@ -4,9 +4,9 @@ #include "chrome/browser/enumerate_modules_model_win.h" -#include <algorithm> #include <Tlhelp32.h> #include <wintrust.h> +#include <algorithm> #include "base/bind.h" #include "base/command_line.h" @@ -15,20 +15,20 @@ #include "base/file_version_info_win.h" #include "base/i18n/case_conversion.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/version.h" #include "base/win/registry.h" #include "base/win/scoped_handle.h" -#include "crypto/sha2.h" #include "chrome/browser/net/service_providers_win.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "content/public/browser/notification_service.h" +#include "crypto/sha2.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/api/alarms/alarms_api.cc b/chrome/browser/extensions/api/alarms/alarms_api.cc index a87072f..5658115 100644 --- a/chrome/browser/extensions/api/alarms/alarms_api.cc +++ b/chrome/browser/extensions/api/alarms/alarms_api.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/alarms/alarms_api.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/api/alarms/alarm_manager.h" #include "chrome/browser/extensions/extension_system.h" diff --git a/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc b/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc index b3071a0..d5180e8 100644 --- a/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc +++ b/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc @@ -6,7 +6,7 @@ #include "base/json/json_writer.h" #include "base/string16.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/event_router.h" diff --git a/chrome/browser/extensions/api/app_window/app_window_apitest.cc b/chrome/browser/extensions/api/app_window/app_window_apitest.cc index 3f723cc..0c40318 100644 --- a/chrome/browser/extensions/api/app_window/app_window_apitest.cc +++ b/chrome/browser/extensions/api/app_window/app_window_apitest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/run_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/platform_app_browsertest_util.h" #include "chrome/browser/extensions/shell_window_registry.h" diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc index cefec0c..4004bf9 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc @@ -8,7 +8,7 @@ #include "base/json/json_writer.h" #include "base/prefs/public/pref_service_base.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc index fcf258e..52d4e5d 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc @@ -7,7 +7,7 @@ #include <math.h> // For floor() #include <vector> -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index f278e65..6faf572 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -16,8 +16,8 @@ #include "base/sha1.h" #include "base/stl_util.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_codec.h" diff --git a/chrome/browser/extensions/api/context_menus/context_menus_api.cc b/chrome/browser/extensions/api/context_menus/context_menus_api.cc index ee22d21..b3cf3d7 100644 --- a/chrome/browser/extensions/api/context_menus/context_menus_api.cc +++ b/chrome/browser/extensions/api/context_menus/context_menus_api.cc @@ -6,8 +6,8 @@ #include <string> -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/menu_manager.h" diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc index 24c13b8..66a2b28 100644 --- a/chrome/browser/extensions/api/debugger/debugger_api.cc +++ b/chrome/browser/extensions/api/debugger/debugger_api.cc @@ -13,7 +13,7 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc index 9eefa68..31f956c 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc @@ -6,7 +6,7 @@ #include "base/base64.h" #include "base/file_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/devtools/devtools_window.h" diff --git a/chrome/browser/extensions/api/dial/dial_registry.cc b/chrome/browser/extensions/api/dial/dial_registry.cc index 74a1d30..0f534b1 100644 --- a/chrome/browser/extensions/api/dial/dial_registry.cc +++ b/chrome/browser/extensions/api/dial/dial_registry.cc @@ -6,7 +6,7 @@ #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/values.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/extensions/api/dial/dial_service.cc b/chrome/browser/extensions/api/dial/dial_service.cc index 743fcf8..744a4b3 100644 --- a/chrome/browser/extensions/api/dial/dial_service.cc +++ b/chrome/browser/extensions/api/dial/dial_service.cc @@ -10,8 +10,8 @@ #include "base/callback.h" #include "base/logging.h" #include "base/rand_util.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "chrome/browser/extensions/api/dial/dial_device_data.h" #include "chrome/common/chrome_version_info.h" diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc index fdc2ee1..1eb54ba 100644 --- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc +++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc @@ -8,8 +8,8 @@ #include "base/base64.h" #include "base/lazy_instance.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/api/extension_action/extension_page_actions_api_constants.h" #include "chrome/browser/extensions/extension_action.h" diff --git a/chrome/browser/extensions/api/history/history_api.cc b/chrome/browser/extensions/api/history/history_api.cc index 53bae98..afbc2ae 100644 --- a/chrome/browser/extensions/api/history/history_api.cc +++ b/chrome/browser/extensions/api/history/history_api.cc @@ -11,7 +11,7 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/extensions/api/idle/idle_api_unittest.cc b/chrome/browser/extensions/api/idle/idle_api_unittest.cc index 4fc7b1bd..fec96da 100644 --- a/chrome/browser/extensions/api/idle/idle_api_unittest.cc +++ b/chrome/browser/extensions/api/idle/idle_api_unittest.cc @@ -7,7 +7,7 @@ #include <limits.h> #include <string> -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/api/idle/idle_api_constants.h" #include "chrome/browser/extensions/api/idle/idle_manager.h" #include "chrome/browser/extensions/api/idle/idle_manager_factory.h" diff --git a/chrome/browser/extensions/api/input/input.cc b/chrome/browser/extensions/api/input/input.cc index 48f6e02..f93ef266 100644 --- a/chrome/browser/extensions/api/input/input.cc +++ b/chrome/browser/extensions/api/input/input.cc @@ -7,8 +7,8 @@ #include <string> #include "base/lazy_instance.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/extension_function_registry.h" #include "chrome/browser/extensions/key_identifier_conversion_views.h" diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.cc b/chrome/browser/extensions/api/input_ime/input_ime_api.cc index b7db669..357fe67 100644 --- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc +++ b/chrome/browser/extensions/api/input_ime/input_ime_api.cc @@ -7,7 +7,7 @@ #include "base/json/json_writer.h" #include "base/lazy_instance.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/input_method/input_method_engine.h" #include "chrome/browser/extensions/event_router.h" diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc index 462e503..5308e7a 100644 --- a/chrome/browser/extensions/api/management/management_api.cc +++ b/chrome/browser/extensions/api/management/management_api.cc @@ -15,8 +15,8 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/api/management/management_api_constants.h" #include "chrome/browser/extensions/event_names.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc index 9a1af13..2b8a6a5 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc @@ -9,7 +9,7 @@ #include "base/file_path.h" #include "base/lazy_instance.h" #include "base/location.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.h" #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc index 0763769..73e236a 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc @@ -8,7 +8,7 @@ #include <map> -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc b/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc index 0d2a47d..c373d42 100644 --- a/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc +++ b/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/process_util.h" #include "base/stringprintf.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" namespace extensions { diff --git a/chrome/browser/extensions/api/notification/notification_api.cc b/chrome/browser/extensions/api/notification/notification_api.cc index bdf8d53..2aea0d9 100644 --- a/chrome/browser/extensions/api/notification/notification_api.cc +++ b/chrome/browser/extensions/api/notification/notification_api.cc @@ -5,7 +5,7 @@ #include "chrome/browser/extensions/api/notification/notification_api.h" #include "base/callback.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/event_names.h" diff --git a/chrome/browser/extensions/api/processes/processes_api.cc b/chrome/browser/extensions/api/processes/processes_api.cc index eb20dac..25989bf 100644 --- a/chrome/browser/extensions/api/processes/processes_api.cc +++ b/chrome/browser/extensions/api/processes/processes_api.cc @@ -9,7 +9,7 @@ #include "base/lazy_instance.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/api/processes/processes_api_constants.h" diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc index 5b9098d..07ca1d3 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/lazy_instance.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h" #include "chrome/browser/extensions/event_names.h" diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc index 753efb0..9c2b154 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc @@ -7,8 +7,8 @@ #include <algorithm> #include <vector> -#include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h" #include "chrome/browser/sync/invalidation_frontend.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/api/record/record_api.cc b/chrome/browser/extensions/api/record/record_api.cc index a16b755..7b12f69 100644 --- a/chrome/browser/extensions/api/record/record_api.cc +++ b/chrome/browser/extensions/api/record/record_api.cc @@ -10,9 +10,9 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/extensions/api/session_restore/session_restore_api.cc b/chrome/browser/extensions/api/session_restore/session_restore_api.cc index 63bd8ce..a2d62c3 100644 --- a/chrome/browser/extensions/api/session_restore/session_restore_api.cc +++ b/chrome/browser/extensions/api/session_restore/session_restore_api.cc @@ -8,7 +8,7 @@ #include "base/i18n/rtl.h" #include "base/lazy_instance.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_function_registry.h" #include "chrome/browser/extensions/extension_tab_util.h" diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc index c70373e..a967d70 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc @@ -16,9 +16,9 @@ #include "base/message_loop.h" #include "base/stl_util.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc index 58bf3c6..1b1180a 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc @@ -7,7 +7,7 @@ #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h" #include "base/json/json_writer.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/values.h" #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_constants.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc index d1da683..2a53275 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api.cc @@ -10,8 +10,8 @@ #include "base/bind_helpers.h" #include "base/json/json_writer.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc b/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc index 941ba4d..a9f1319 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc @@ -7,9 +7,9 @@ #include <cmath> #include "base/bind.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/values.h" #include "chrome/browser/extensions/api/web_request/web_request_api.h" diff --git a/chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc b/chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc index 30b45ed..3209c7a 100644 --- a/chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc +++ b/chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/internal_auth.h" @@ -14,8 +14,8 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" -#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_service.h" #include "net/base/escape.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" diff --git a/chrome/browser/extensions/app_notification.cc b/chrome/browser/extensions/app_notification.cc index b9342ae..c9c44a6 100644 --- a/chrome/browser/extensions/app_notification.cc +++ b/chrome/browser/extensions/app_notification.cc @@ -6,8 +6,8 @@ #include "base/guid.h" #include "base/json/json_writer.h" -#include "base/string_number_conversions.h" #include "base/memory/scoped_ptr.h" +#include "base/strings/string_number_conversions.h" namespace extensions { diff --git a/chrome/browser/extensions/app_notification_manager_sync_unittest.cc b/chrome/browser/extensions/app_notification_manager_sync_unittest.cc index bd6684e..c5f1d63 100644 --- a/chrome/browser/extensions/app_notification_manager_sync_unittest.cc +++ b/chrome/browser/extensions/app_notification_manager_sync_unittest.cc @@ -5,7 +5,7 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/app_notification.h" #include "chrome/browser/extensions/app_notification_manager.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/extensions/app_notification_test_util.cc b/chrome/browser/extensions/app_notification_test_util.cc index 3fc7efd..20aaccd 100644 --- a/chrome/browser/extensions/app_notification_test_util.cc +++ b/chrome/browser/extensions/app_notification_test_util.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_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/app_notification_manager.h" #include "chrome/browser/extensions/app_notification_test_util.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chrome/browser/extensions/chrome_app_api_browsertest.cc index 55b0efd8..a961366 100644 --- a/chrome/browser/extensions/chrome_app_api_browsertest.cc +++ b/chrome/browser/extensions/chrome_app_api_browsertest.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index 382a469..37c3672 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc @@ -11,8 +11,8 @@ #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/app_shortcut_manager.h" #include "chrome/browser/extensions/component_loader.h" diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc index 1aa84cb..c8b3521 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc @@ -9,9 +9,9 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/bundle_installer.h" #include "chrome/browser/extensions/extension_install_ui.h" diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc index 38260d1..9178929 100644 --- a/chrome/browser/extensions/extension_prefs.cc +++ b/chrome/browser/extensions/extension_prefs.cc @@ -6,8 +6,8 @@ #include "base/command_line.h" #include "base/prefs/pref_notifier.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/version.h" #include "chrome/browser/extensions/admin_policy.h" diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index e680906..d955323 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc @@ -9,8 +9,8 @@ #include "base/path_service.h" #include "base/prefs/public/pref_change_registrar.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/extension_pref_value_map.h" #include "chrome/browser/extensions/extension_prefs.h" diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc index 2e8325f..1de90ca 100644 --- a/chrome/browser/extensions/extension_process_manager.cc +++ b/chrome/browser/extensions/extension_process_manager.cc @@ -9,12 +9,12 @@ #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "chrome/browser/extensions/api/runtime/runtime_api.h" -#include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_info_map.h" +#include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 5617fb9..619ed3c 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -17,9 +17,9 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index b2e5b96..2589d40 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -23,8 +23,8 @@ #include "base/path_service.h" #include "base/stl_util.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/version.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/extensions/extension_test_message_listener.cc b/chrome/browser/extensions/extension_test_message_listener.cc index 1a98046..675d4a2 100644 --- a/chrome/browser/extensions/extension_test_message_listener.cc +++ b/chrome/browser/extensions/extension_test_message_listener.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/extension_test_message_listener.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/api/test/test_api.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/extensions/image_loader.cc b/chrome/browser/extensions/image_loader.cc index a8a7895..c488b57 100644 --- a/chrome/browser/extensions/image_loader.cc +++ b/chrome/browser/extensions/image_loader.cc @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/file_util.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/extensions/image_loader_factory.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/extensions/sandboxed_unpacker.cc b/chrome/browser/extensions/sandboxed_unpacker.cc index 0171b7c..8c6f209 100644 --- a/chrome/browser/extensions/sandboxed_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_unpacker.cc @@ -24,9 +24,10 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_utility_messages.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_l10n_util.h" +#include "chrome/common/extensions/extension_manifest_constants.h" +#include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/unpacker.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/utility_process_host.h" diff --git a/chrome/browser/extensions/shell_window_geometry_cache.cc b/chrome/browser/extensions/shell_window_geometry_cache.cc index e50413a..8f7f8da 100644 --- a/chrome/browser/extensions/shell_window_geometry_cache.cc +++ b/chrome/browser/extensions/shell_window_geometry_cache.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/shell_window_geometry_cache_unittest.cc b/chrome/browser/extensions/shell_window_geometry_cache_unittest.cc index 1cbbb2a..44d7676 100644 --- a/chrome/browser/extensions/shell_window_geometry_cache_unittest.cc +++ b/chrome/browser/extensions/shell_window_geometry_cache_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/shell_window_geometry_cache.h" #include "chrome/browser/extensions/test_extension_prefs.h" diff --git a/chrome/browser/extensions/standard_management_policy_provider_unittest.cc b/chrome/browser/extensions/standard_management_policy_provider_unittest.cc index 61fccf3..3462b54 100644 --- a/chrome/browser/extensions/standard_management_policy_provider_unittest.cc +++ b/chrome/browser/extensions/standard_management_policy_provider_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/blacklist.h" #include "chrome/browser/extensions/extension_prefs.h" diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc index ab60b59..819c1fc 100644 --- a/chrome/browser/extensions/updater/extension_updater.cc +++ b/chrome/browser/extensions/updater/extension_updater.cc @@ -13,8 +13,8 @@ #include "base/metrics/histogram.h" #include "base/rand_util.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/blacklist.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index 7b8e5d0..7267b61 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc @@ -18,10 +18,10 @@ #include "base/run_loop.h" #include "base/sequenced_task_runner.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" #include "base/version.h" #include "chrome/browser/extensions/blacklist.h" diff --git a/chrome/browser/extensions/updater/manifest_fetch_data.cc b/chrome/browser/extensions/updater/manifest_fetch_data.cc index e4f8662..99e718f 100644 --- a/chrome/browser/extensions/updater/manifest_fetch_data.cc +++ b/chrome/browser/extensions/updater/manifest_fetch_data.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/metrics/metrics_service.h" #include "net/base/escape.h" diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index d6e8a96..bc67e7b 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc @@ -9,9 +9,9 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/rand_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_crx_util.h" diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index 0afde72..5270ce4 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -4,9 +4,9 @@ #include "chrome/browser/first_run/first_run.h" +#include <windows.h> #include <shellapi.h> #include <shlobj.h> -#include <windows.h> #include "base/callback.h" #include "base/environment.h" @@ -14,9 +14,9 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc index bc7d725..ca267a8 100644 --- a/chrome/browser/first_run/upgrade_util_win.cc +++ b/chrome/browser/first_run/upgrade_util_win.cc @@ -18,9 +18,9 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/win/metro.h" #include "base/win/registry.h" #include "base/win/scoped_comptr.h" diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index a3c4dcd..3ecd40b 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -5,8 +5,8 @@ #include <string> #include "base/compiler_specific.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/api/infobars/infobar_service.h" diff --git a/chrome/browser/google/google_util.cc b/chrome/browser/google/google_util.cc index 7146303..730c701 100644 --- a/chrome/browser/google/google_util.cc +++ b/chrome/browser/google/google_util.cc @@ -9,9 +9,9 @@ #include "base/command_line.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_url_tracker.h" diff --git a/chrome/browser/google_apis/base_operations.cc b/chrome/browser/google_apis/base_operations.cc index 510e084..9fadd16 100644 --- a/chrome/browser/google_apis/base_operations.cc +++ b/chrome/browser/google_apis/base_operations.cc @@ -5,8 +5,8 @@ #include "chrome/browser/google_apis/base_operations.h" #include "base/json/json_reader.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/task_runner_util.h" #include "base/threading/sequenced_worker_pool.h" #include "base/values.h" diff --git a/chrome/browser/google_apis/drive_api_parser.cc b/chrome/browser/google_apis/drive_api_parser.cc index 7b0c5d9..97e175a 100644 --- a/chrome/browser/google_apis/drive_api_parser.cc +++ b/chrome/browser/google_apis/drive_api_parser.cc @@ -10,9 +10,9 @@ #include "base/file_path.h" #include "base/json/json_value_converter.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/google_apis/time_util.h" diff --git a/chrome/browser/google_apis/drive_api_url_generator.cc b/chrome/browser/google_apis/drive_api_url_generator.cc index 7dc911d..032b508 100644 --- a/chrome/browser/google_apis/drive_api_url_generator.cc +++ b/chrome/browser/google_apis/drive_api_url_generator.cc @@ -4,8 +4,8 @@ #include "chrome/browser/google_apis/drive_api_url_generator.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "net/base/escape.h" #include "net/base/url_util.h" diff --git a/chrome/browser/google_apis/drive_uploader.cc b/chrome/browser/google_apis/drive_uploader.cc index 9be960f..a31c2b1 100644 --- a/chrome/browser/google_apis/drive_uploader.cc +++ b/chrome/browser/google_apis/drive_uploader.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/google_apis/drive_service_interface.h" #include "chrome/browser/google_apis/drive_upload_mode.h" #include "chrome/browser/google_apis/gdata_wapi_parser.h" diff --git a/chrome/browser/google_apis/fake_drive_service.cc b/chrome/browser/google_apis/fake_drive_service.cc index aa531bc..9874a34 100644 --- a/chrome/browser/google_apis/fake_drive_service.cc +++ b/chrome/browser/google_apis/fake_drive_service.cc @@ -9,10 +9,10 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_tokenizer.h" #include "base/utf_string_conversions.h" #include "chrome/browser/google_apis/drive_api_parser.h" diff --git a/chrome/browser/google_apis/gdata_wapi_operations.cc b/chrome/browser/google_apis/gdata_wapi_operations.cc index 6933795..3ed0d89 100644 --- a/chrome/browser/google_apis/gdata_wapi_operations.cc +++ b/chrome/browser/google_apis/gdata_wapi_operations.cc @@ -4,8 +4,8 @@ #include "chrome/browser/google_apis/gdata_wapi_operations.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/google_apis/gdata_wapi_url_generator.h" diff --git a/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc index c3871aa..0af98fb 100644 --- a/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc +++ b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc @@ -9,9 +9,9 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/message_loop_proxy.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/google_apis/gdata_wapi_operations.h" #include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "chrome/browser/google_apis/gdata_wapi_url_generator.h" diff --git a/chrome/browser/google_apis/gdata_wapi_parser.cc b/chrome/browser/google_apis/gdata_wapi_parser.cc index 36c0574..ebe5af2 100644 --- a/chrome/browser/google_apis/gdata_wapi_parser.cc +++ b/chrome/browser/google_apis/gdata_wapi_parser.cc @@ -11,9 +11,9 @@ #include "base/file_path.h" #include "base/json/json_value_converter.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/google_apis/drive_api_parser.h" diff --git a/chrome/browser/google_apis/operation_registry.cc b/chrome/browser/google_apis/operation_registry.cc index 6daa858..b465e17 100644 --- a/chrome/browser/google_apis/operation_registry.cc +++ b/chrome/browser/google_apis/operation_registry.cc @@ -4,7 +4,7 @@ #include "chrome/browser/google_apis/operation_registry.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread; diff --git a/chrome/browser/google_apis/test_server/http_request.cc b/chrome/browser/google_apis/test_server/http_request.cc index b3c9a22..157fb49 100644 --- a/chrome/browser/google_apis/test_server/http_request.cc +++ b/chrome/browser/google_apis/test_server/http_request.cc @@ -7,9 +7,9 @@ #include <algorithm> #include "base/logging.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" namespace google_apis { namespace test_server { diff --git a/chrome/browser/google_apis/time_util.cc b/chrome/browser/google_apis/time_util.cc index 093e627..331edaf 100644 --- a/chrome/browser/google_apis/time_util.cc +++ b/chrome/browser/google_apis/time_util.cc @@ -7,9 +7,9 @@ #include <string> #include <vector> -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" namespace google_apis { diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc index e59215e..5702b18 100644 --- a/chrome/browser/history/history_backend_unittest.cc +++ b/chrome/browser/history/history_backend_unittest.cc @@ -16,7 +16,7 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/string16.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/history/history_types.cc b/chrome/browser/history/history_types.cc index 388f535..70e0e2b 100644 --- a/chrome/browser/history/history_types.cc +++ b/chrome/browser/history/history_types.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/history/page_usage_data.h" diff --git a/chrome/browser/history/text_database.cc b/chrome/browser/history/text_database.cc index 90ea014..567a4eb 100644 --- a/chrome/browser/history/text_database.cc +++ b/chrome/browser/history/text_database.cc @@ -11,8 +11,8 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/diagnostics/sqlite_diagnostics.h" #include "sql/statement.h" diff --git a/chrome/browser/history/thumbnail_database.cc b/chrome/browser/history/thumbnail_database.cc index 03d3f14..3f047ce 100644 --- a/chrome/browser/history/thumbnail_database.cc +++ b/chrome/browser/history/thumbnail_database.cc @@ -11,8 +11,8 @@ #include "base/file_util.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_tokenizer.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/history/visit_database.cc b/chrome/browser/history/visit_database.cc index dcc17ea..939415a 100644 --- a/chrome/browser/history/visit_database.cc +++ b/chrome/browser/history/visit_database.cc @@ -10,7 +10,7 @@ #include <set> #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/history/url_database.h" #include "chrome/browser/history/visit_filter.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/history/web_history_service.cc b/chrome/browser/history/web_history_service.cc index 84d168c..14d71e1 100644 --- a/chrome/browser/history/web_history_service.cc +++ b/chrome/browser/history/web_history_service.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/signin/oauth2_token_service.h" #include "chrome/browser/signin/oauth2_token_service_factory.h" diff --git a/chrome/browser/importer/external_process_importer_bridge.cc b/chrome/browser/importer/external_process_importer_bridge.cc index ff69443..92d2857 100644 --- a/chrome/browser/importer/external_process_importer_bridge.cc +++ b/chrome/browser/importer/external_process_importer_bridge.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/task_runner.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/importer/external_process_importer_client.cc b/chrome/browser/importer/external_process_importer_client.cc index bcec842..b972937 100644 --- a/chrome/browser/importer/external_process_importer_client.cc +++ b/chrome/browser/importer/external_process_importer_client.cc @@ -5,7 +5,7 @@ #include "chrome/browser/importer/external_process_importer_client.h" #include "base/bind.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/importer/external_process_importer_host.h" #include "chrome/browser/importer/firefox_importer_utils.h" diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc index b05a554..d524b64 100644 --- a/chrome/browser/importer/firefox2_importer.cc +++ b/chrome/browser/importer/firefox2_importer.cc @@ -13,9 +13,9 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/importer/firefox_importer_utils.h" diff --git a/chrome/browser/importer/firefox_importer_utils.cc b/chrome/browser/importer/firefox_importer_utils.cc index 5bcf30c..071423e 100644 --- a/chrome/browser/importer/firefox_importer_utils.cc +++ b/chrome/browser/importer/firefox_importer_utils.cc @@ -10,16 +10,16 @@ #include "base/file_util.h" #include "base/logging.h" -#include "base/stringprintf.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/search_engines/template_url.h" -#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_parser.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" +#include "chrome/browser/search_engines/template_url_service.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/importer/mork_reader.cc b/chrome/browser/importer/mork_reader.cc index ce15f72..ccfa98e 100644 --- a/chrome/browser/importer/mork_reader.cc +++ b/chrome/browser/importer/mork_reader.cc @@ -48,8 +48,8 @@ #include "base/i18n/icu_string_conversions.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/importer/firefox_importer_utils.h" #include "chrome/browser/importer/importer_bridge.h" diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index a830bd6..2555b59 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -8,8 +8,8 @@ #include <set> #include <string> -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc index 60ec73a..fddb595 100644 --- a/chrome/browser/importer/toolbar_importer.cc +++ b/chrome/browser/importer/toolbar_importer.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/rand_util.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/importer/importer_bridge.h" diff --git a/chrome/browser/infobars/infobar_extension_api.cc b/chrome/browser/infobars/infobar_extension_api.cc index c1a0208..67c2a2b 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_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/api/infobars/infobar_service.h" diff --git a/chrome/browser/internal_auth.cc b/chrome/browser/internal_auth.cc index 823d125..c863cb0 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_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" #include "base/time.h" diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index e909db1..8677d13 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -13,9 +13,9 @@ #include "base/debug/leak_tracker.h" #include "base/logging.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" #include "base/threading/worker_pool.h" #include "build/build_config.h" diff --git a/chrome/browser/managed_mode/managed_mode_navigation_observer.cc b/chrome/browser/managed_mode/managed_mode_navigation_observer.cc index 24fd2cd..cc2ac2c 100644 --- a/chrome/browser/managed_mode/managed_mode_navigation_observer.cc +++ b/chrome/browser/managed_mode/managed_mode_navigation_observer.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h" diff --git a/chrome/browser/managed_mode/managed_mode_url_filter.cc b/chrome/browser/managed_mode/managed_mode_url_filter.cc index b62db2c..b4d2b79 100644 --- a/chrome/browser/managed_mode/managed_mode_url_filter.cc +++ b/chrome/browser/managed_mode/managed_mode_url_filter.cc @@ -9,8 +9,8 @@ #include "base/json/json_file_value_serializer.h" #include "base/metrics/histogram.h" #include "base/sha1.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/task_runner_util.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/policy/url_blacklist_manager.h" diff --git a/chrome/browser/media_gallery/media_file_system_registry.cc b/chrome/browser/media_gallery/media_file_system_registry.cc index 3560dc1..3db6468 100644 --- a/chrome/browser/media_gallery/media_file_system_registry.cc +++ b/chrome/browser/media_gallery/media_file_system_registry.cc @@ -16,8 +16,9 @@ #include "base/json/json_writer.h" #include "base/path_service.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" +#include "base/system_monitor/system_monitor.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h" @@ -32,9 +33,9 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_set.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/media_gallery/media_galleries_preferences.cc b/chrome/browser/media_gallery/media_galleries_preferences.cc index da6c737..cadc708 100644 --- a/chrome/browser/media_gallery/media_galleries_preferences.cc +++ b/chrome/browser/media_gallery/media_galleries_preferences.cc @@ -6,7 +6,7 @@ #include "base/path_service.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.h" diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc index 03fa5cf..f7a4948 100644 --- a/chrome/browser/metrics/metrics_log.cc +++ b/chrome/browser/metrics/metrics_log.cc @@ -14,8 +14,8 @@ #include "base/memory/scoped_ptr.h" #include "base/perftimer.h" #include "base/profiler/alternate_timer.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/sys_info.h" #include "base/third_party/nspr/prtime.h" #include "base/time.h" diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index 5e06415..0d99759 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -159,7 +159,7 @@ #include "base/metrics/histogram.h" #include "base/metrics/statistics_recorder.h" #include "base/rand_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc index 043dfce..afc84f2 100644 --- a/chrome/browser/metrics/thread_watcher.cc +++ b/chrome/browser/metrics/thread_watcher.cc @@ -10,8 +10,8 @@ #include "base/compiler_specific.h" #include "base/debug/alias.h" #include "base/lazy_instance.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_tokenizer.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" diff --git a/chrome/browser/metrics/thread_watcher_unittest.cc b/chrome/browser/metrics/thread_watcher_unittest.cc index c5e1ad6..e097aee 100644 --- a/chrome/browser/metrics/thread_watcher_unittest.cc +++ b/chrome/browser/metrics/thread_watcher_unittest.cc @@ -10,8 +10,8 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_tokenizer.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index e81eeda..4f42e13 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -13,10 +13,10 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/win/windows_version.h" #include "build/build_config.h" diff --git a/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc b/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc index 9be03c0..3addab8 100644 --- a/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc +++ b/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc @@ -6,7 +6,7 @@ #include "base/environment.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/nacl_host/nacl_browser.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/ppapi/ppapi_test.h" diff --git a/chrome/browser/net/chrome_net_log.cc b/chrome/browser/net/chrome_net_log.cc index 4ba7f79..068fc62 100644 --- a/chrome/browser/net/chrome_net_log.cc +++ b/chrome/browser/net/chrome_net_log.cc @@ -6,8 +6,8 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/net/load_timing_observer.h" #include "chrome/browser/net/net_log_logger.h" diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc index c66e515..d05a93a 100644 --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc @@ -11,8 +11,8 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/prefs/public/pref_member.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" diff --git a/chrome/browser/net/crl_set_fetcher.cc b/chrome/browser/net/crl_set_fetcher.cc index 9c869b3..ac3f805 100644 --- a/chrome/browser/net/crl_set_fetcher.cc +++ b/chrome/browser/net/crl_set_fetcher.cc @@ -8,7 +8,7 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/rand_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "chrome/browser/component_updater/component_updater_service.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/net/dns_probe_service.cc b/chrome/browser/net/dns_probe_service.cc index 0665b59..8a0e9f0 100644 --- a/chrome/browser/net/dns_probe_service.cc +++ b/chrome/browser/net/dns_probe_service.cc @@ -6,7 +6,7 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/net/dns_probe_job.h" #include "chrome/common/net/net_error_info.h" #include "net/base/ip_endpoint.h" diff --git a/chrome/browser/net/http_pipelining_compatibility_client.cc b/chrome/browser/net/http_pipelining_compatibility_client.cc index 1cfe5cc..ca6e5c9 100644 --- a/chrome/browser/net/http_pipelining_compatibility_client.cc +++ b/chrome/browser/net/http_pipelining_compatibility_client.cc @@ -6,9 +6,9 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/io_thread.h" #include "chrome/common/chrome_version_info.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/net/http_server_properties_manager.cc b/chrome/browser/net/http_server_properties_manager.cc index 87b4d93..879e62a 100644 --- a/chrome/browser/net/http_server_properties_manager.cc +++ b/chrome/browser/net/http_server_properties_manager.cc @@ -5,8 +5,8 @@ #include "base/bind.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/net/load_time_stats.cc b/chrome/browser/net/load_time_stats.cc index 648e7a7..8934def 100644 --- a/chrome/browser/net/load_time_stats.cc +++ b/chrome/browser/net/load_time_stats.cc @@ -6,7 +6,7 @@ #include "base/metrics/histogram.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/timer.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/io_thread.h" diff --git a/chrome/browser/net/predictor_unittest.cc b/chrome/browser/net/predictor_unittest.cc index 93d3554..dae3af3 100644 --- a/chrome/browser/net/predictor_unittest.cc +++ b/chrome/browser/net/predictor_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/timer.h" #include "base/values.h" #include "chrome/browser/net/predictor.h" diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc index 0dd312a..652e6a4 100644 --- a/chrome/browser/net/proxy_service_factory.cc +++ b/chrome/browser/net/proxy_service_factory.cc @@ -5,7 +5,7 @@ #include "chrome/browser/net/proxy_service_factory.h" #include "base/command_line.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/io_thread.h" diff --git a/chrome/browser/page_cycler/page_cycler.cc b/chrome/browser/page_cycler/page_cycler.cc index 1208a48..675d174 100644 --- a/chrome/browser/page_cycler/page_cycler.cc +++ b/chrome/browser/page_cycler/page_cycler.cc @@ -9,8 +9,8 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/parsers/metadata_parser_filebase.cc b/chrome/browser/parsers/metadata_parser_filebase.cc index 123cb6f..9105fe3 100644 --- a/chrome/browser/parsers/metadata_parser_filebase.cc +++ b/chrome/browser/parsers/metadata_parser_filebase.cc @@ -5,7 +5,7 @@ #include "chrome/browser/parsers/metadata_parser_filebase.h" #include "base/file_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" FileMetadataParser::FileMetadataParser(const FilePath& path) diff --git a/chrome/browser/parsers/metadata_parser_filebase_unittest.cc b/chrome/browser/parsers/metadata_parser_filebase_unittest.cc index b8bd470..99fc871 100644 --- a/chrome/browser/parsers/metadata_parser_filebase_unittest.cc +++ b/chrome/browser/parsers/metadata_parser_filebase_unittest.cc @@ -8,8 +8,8 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" // TODO(brettw) remove when WideToASCII moves. +#include "base/strings/string_number_conversions.h" #include "chrome/browser/parsers/metadata_parser_filebase.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/password_manager/login_database_unittest.cc b/chrome/browser/password_manager/login_database_unittest.cc index 18a403d..c8d960a 100644 --- a/chrome/browser/password_manager/login_database_unittest.cc +++ b/chrome/browser/password_manager/login_database_unittest.cc @@ -8,7 +8,7 @@ #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/login_database.h" diff --git a/chrome/browser/password_manager/native_backend_gnome_x.cc b/chrome/browser/password_manager/native_backend_gnome_x.cc index 6fa8f6c..ff974cb 100644 --- a/chrome/browser/password_manager/native_backend_gnome_x.cc +++ b/chrome/browser/password_manager/native_backend_gnome_x.cc @@ -12,10 +12,10 @@ #include <vector> #include "base/logging.h" -#include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/performance_monitor/database.cc b/chrome/browser/performance_monitor/database.cc index 5f53ed2..ed1c504 100644 --- a/chrome/browser/performance_monitor/database.cc +++ b/chrome/browser/performance_monitor/database.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/performance_monitor/key_builder.h" diff --git a/chrome/browser/performance_monitor/key_builder.cc b/chrome/browser/performance_monitor/key_builder.cc index 44eef32..a2930d0 100644 --- a/chrome/browser/performance_monitor/key_builder.cc +++ b/chrome/browser/performance_monitor/key_builder.cc @@ -6,9 +6,9 @@ #include "base/format_macros.h" #include "base/logging.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" namespace performance_monitor { diff --git a/chrome/browser/performance_monitor/metric.cc b/chrome/browser/performance_monitor/metric.cc index 5b013ad..de50cb3 100644 --- a/chrome/browser/performance_monitor/metric.cc +++ b/chrome/browser/performance_monitor/metric.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "chrome/browser/performance_monitor/constants.h" diff --git a/chrome/browser/performance_monitor/performance_monitor.cc b/chrome/browser/performance_monitor/performance_monitor.cc index 3f1ba00..dce9b53 100644 --- a/chrome/browser/performance_monitor/performance_monitor.cc +++ b/chrome/browser/performance_monitor/performance_monitor.cc @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/process_util.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/worker_pool.h" #include "base/time.h" #include "chrome/browser/browser_process.h" @@ -35,8 +35,8 @@ #include "content/public/browser/load_notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" -#include "content/public/browser/render_widget_host.h" #include "content/public/browser/render_view_host.h" +#include "content/public/browser/render_widget_host.h" #include "content/public/browser/web_contents.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc index d30426d..1ac03a3 100644 --- a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc +++ b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc @@ -6,7 +6,7 @@ #include "base/file_path.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_browsertest.h" diff --git a/chrome/browser/performance_monitor/performance_monitor_util.cc b/chrome/browser/performance_monitor/performance_monitor_util.cc index 6c93719..2682240 100644 --- a/chrome/browser/performance_monitor/performance_monitor_util.cc +++ b/chrome/browser/performance_monitor/performance_monitor_util.cc @@ -6,7 +6,7 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time.h" #include "chrome/browser/performance_monitor/events.h" diff --git a/chrome/browser/performance_monitor/startup_timer.cc b/chrome/browser/performance_monitor/startup_timer.cc index 66f4909..8256ba3 100644 --- a/chrome/browser/performance_monitor/startup_timer.cc +++ b/chrome/browser/performance_monitor/startup_timer.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/performance_monitor/database.h" #include "chrome/browser/performance_monitor/performance_monitor.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/policy/auto_enrollment_client.cc b/chrome/browser/policy/auto_enrollment_client.cc index 2c8294f..06dbba0 100644 --- a/chrome/browser/policy/auto_enrollment_client.cc +++ b/chrome/browser/policy/auto_enrollment_client.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/message_loop_proxy.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h" diff --git a/chrome/browser/policy/config_dir_policy_loader_unittest.cc b/chrome/browser/policy/config_dir_policy_loader_unittest.cc index d4a0c2e..80d518e 100644 --- a/chrome/browser/policy/config_dir_policy_loader_unittest.cc +++ b/chrome/browser/policy/config_dir_policy_loader_unittest.cc @@ -7,7 +7,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/json/json_string_value_serializer.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/policy/async_policy_provider.h" #include "chrome/browser/policy/config_dir_policy_loader.h" diff --git a/chrome/browser/policy/configuration_policy_handler.cc b/chrome/browser/policy/configuration_policy_handler.cc index 9bbd2b2..661f481 100644 --- a/chrome/browser/policy/configuration_policy_handler.cc +++ b/chrome/browser/policy/configuration_policy_handler.cc @@ -13,8 +13,8 @@ #include "base/prefs/pref_value_map.h" #include "base/stl_util.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/extensions/external_policy_loader.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" diff --git a/chrome/browser/policy/device_status_collector.cc b/chrome/browser/policy/device_status_collector.cc index 4776b04..3b76121 100644 --- a/chrome/browser/policy/device_status_collector.cc +++ b/chrome/browser/policy/device_status_collector.cc @@ -11,7 +11,7 @@ #include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/cros_settings_names.h" diff --git a/chrome/browser/policy/policy_error_map.cc b/chrome/browser/policy/policy_error_map.cc index a0514da..e94d98f 100644 --- a/chrome/browser/policy/policy_error_map.cc +++ b/chrome/browser/policy/policy_error_map.cc @@ -6,8 +6,8 @@ #include <utility> -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/policy/policy_loader_win.cc b/chrome/browser/policy/policy_loader_win.cc index b20badc..2e43bab 100644 --- a/chrome/browser/policy/policy_loader_win.cc +++ b/chrome/browser/policy/policy_loader_win.cc @@ -18,7 +18,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/win/registry.h" diff --git a/chrome/browser/policy/policy_loader_win_unittest.cc b/chrome/browser/policy/policy_loader_win_unittest.cc index e2cda73..7e82463 100644 --- a/chrome/browser/policy/policy_loader_win_unittest.cc +++ b/chrome/browser/policy/policy_loader_win_unittest.cc @@ -9,9 +9,9 @@ #include "base/json/json_writer.h" #include "base/process.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" #include "chrome/browser/policy/async_policy_provider.h" diff --git a/chrome/browser/policy/url_blacklist_manager.cc b/chrome/browser/policy/url_blacklist_manager.cc index 460cfb4..9c3d216 100644 --- a/chrome/browser/policy/url_blacklist_manager.cc +++ b/chrome/browser/policy/url_blacklist_manager.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/message_loop.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/predictors/resource_prefetch_predictor.cc b/chrome/browser/predictors/resource_prefetch_predictor.cc index f35d1e8..a6d7cbd 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor.cc +++ b/chrome/browser/predictors/resource_prefetch_predictor.cc @@ -11,8 +11,8 @@ #include "base/command_line.h" #include "base/metrics/histogram.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "chrome/browser/history/history_database.h" #include "chrome/browser/history/history_db_task.h" diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc index 395d84e..6321593 100644 --- a/chrome/browser/prefs/command_line_pref_store.cc +++ b/chrome/browser/prefs/command_line_pref_store.cc @@ -8,8 +8,8 @@ #include <vector> #include "base/logging.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc index 5f44b0a..5b5410a4 100644 --- a/chrome/browser/prefs/pref_service.cc +++ b/chrome/browser/prefs/pref_service.cc @@ -13,8 +13,8 @@ #include "base/metrics/histogram.h" #include "base/prefs/default_pref_store.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/value_conversions.h" #include "build/build_config.h" #include "chrome/browser/prefs/pref_notifier_impl.h" diff --git a/chrome/browser/prefs/pref_service_simple.cc b/chrome/browser/prefs/pref_service_simple.cc new file mode 100644 index 0000000..c19fd86 --- /dev/null +++ b/chrome/browser/prefs/pref_service_simple.cc @@ -0,0 +1,76 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/prefs/pref_service.h" + +#include "base/file_path.h" +#include "base/strings/string_number_conversions.h" +#include "base/values.h" + +PrefServiceSimple::PrefServiceSimple( + PrefNotifierImpl* pref_notifier, + PrefValueStore* pref_value_store, + PersistentPrefStore* user_prefs, + DefaultPrefStore* default_store, + base::Callback<void(PersistentPrefStore::PrefReadError)> + read_error_callback, + bool async) + : PrefService(pref_notifier, + pref_value_store, + user_prefs, + default_store, + read_error_callback, + async) { +} + +PrefServiceSimple::~PrefServiceSimple() {} + +void PrefServiceSimple::RegisterBooleanPref(const char* path, + bool default_value) { + RegisterPreference(path, Value::CreateBooleanValue(default_value)); +} + +void PrefServiceSimple::RegisterIntegerPref(const char* path, + int default_value) { + RegisterPreference(path, Value::CreateIntegerValue(default_value)); +} + +void PrefServiceSimple::RegisterDoublePref(const char* path, + double default_value) { + RegisterPreference(path, Value::CreateDoubleValue(default_value)); +} + +void PrefServiceSimple::RegisterStringPref(const char* path, + const std::string& default_value) { + RegisterPreference(path, Value::CreateStringValue(default_value)); +} + +void PrefServiceSimple::RegisterFilePathPref(const char* path, + const FilePath& default_value) { + RegisterPreference(path, Value::CreateStringValue(default_value.value())); +} + +void PrefServiceSimple::RegisterListPref(const char* path) { + RegisterPreference(path, new ListValue()); +} + +void PrefServiceSimple::RegisterListPref(const char* path, + ListValue* default_value) { + RegisterPreference(path, default_value); +} + +void PrefServiceSimple::RegisterDictionaryPref(const char* path) { + RegisterPreference(path, new DictionaryValue()); +} + +void PrefServiceSimple::RegisterDictionaryPref(const char* path, + DictionaryValue* default_value) { + RegisterPreference(path, default_value); +} + +void PrefServiceSimple::RegisterInt64Pref(const char* path, + int64 default_value) { + RegisterPreference( + path, Value::CreateStringValue(base::Int64ToString(default_value))); +} diff --git a/chrome/browser/prefs/pref_service_syncable.cc b/chrome/browser/prefs/pref_service_syncable.cc index d92e68b..bbb7f0e 100644 --- a/chrome/browser/prefs/pref_service_syncable.cc +++ b/chrome/browser/prefs/pref_service_syncable.cc @@ -8,7 +8,7 @@ #include "base/file_path.h" #include "base/prefs/default_pref_store.h" #include "base/prefs/overlay_user_pref_store.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/value_conversions.h" #include "chrome/browser/prefs/pref_model_associator.h" #include "chrome/browser/prefs/pref_notifier_impl.h" diff --git a/chrome/browser/prerender/prerender_history.cc b/chrome/browser/prerender/prerender_history.cc index fdce51db..641ce5d 100644 --- a/chrome/browser/prerender/prerender_history.cc +++ b/chrome/browser/prerender/prerender_history.cc @@ -5,7 +5,7 @@ #include "chrome/browser/prerender/prerender_history.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" namespace prerender { diff --git a/chrome/browser/prerender/prerender_tab_helper.cc b/chrome/browser/prerender/prerender_tab_helper.cc index 7950027..685b54d 100644 --- a/chrome/browser/prerender/prerender_tab_helper.cc +++ b/chrome/browser/prerender/prerender_tab_helper.cc @@ -5,7 +5,7 @@ #include "chrome/browser/prerender/prerender_tab_helper.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "chrome/browser/prerender/prerender_histograms.h" #include "chrome/browser/prerender/prerender_manager.h" diff --git a/chrome/browser/process_info_snapshot_mac.cc b/chrome/browser/process_info_snapshot_mac.cc index 4dc981e..99a21ab 100644 --- a/chrome/browser/process_info_snapshot_mac.cc +++ b/chrome/browser/process_info_snapshot_mac.cc @@ -10,8 +10,8 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" // Default constructor. diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index 3ad97d9..253aaf0 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -70,9 +70,9 @@ #include "base/safe_strerror_posix.h" #include "base/sequenced_task_runner_helpers.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/sys_string_conversions.h" #include "base/threading/platform_thread.h" #include "base/time.h" diff --git a/chrome/browser/profiles/avatar_menu_model.cc b/chrome/browser/profiles/avatar_menu_model.cc index 6176834..831b872 100644 --- a/chrome/browser/profiles/avatar_menu_model.cc +++ b/chrome/browser/profiles/avatar_menu_model.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/metrics/field_trial.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/avatar_menu_model_observer.h" diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc index f883d55..8ab27fb 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc @@ -12,8 +12,8 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/prefs/json_pref_store.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "build/build_config.h" #include "chrome/browser/background/background_contents_service_factory.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 9af1d83..e3e7b5c 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -14,9 +14,9 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/prefs/json_pref_store.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/threading/sequenced_worker_pool.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/profiles/profile_info_cache.cc b/chrome/browser/profiles/profile_info_cache.cc index ce1f97d..a5e40be 100644 --- a/chrome/browser/profiles/profile_info_cache.cc +++ b/chrome/browser/profiles/profile_info_cache.cc @@ -12,9 +12,9 @@ #include "base/memory/scoped_ptr.h" #include "base/rand_util.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index bcbc31c..6138ea2 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -14,9 +14,9 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/content_settings/host_content_settings_map.h" diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index c74ae1d..341436b 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -11,8 +11,8 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/referrer_policy_browsertest.cc b/chrome/browser/referrer_policy_browsertest.cc index ff7f441..364df50 100644 --- a/chrome/browser/referrer_policy_browsertest.cc +++ b/chrome/browser/referrer_policy_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" diff --git a/chrome/browser/safe_browsing/chunk_range.cc b/chrome/browser/safe_browsing/chunk_range.cc index f389342..dc1ff93 100644 --- a/chrome/browser/safe_browsing/chunk_range.cc +++ b/chrome/browser/safe_browsing/chunk_range.cc @@ -9,9 +9,9 @@ #include "chrome/browser/safe_browsing/chunk_range.h" #include "base/logging.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" ChunkRange::ChunkRange(int start) : start_(start), stop_(start) { } diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc index 64804d7..4ecbd7b 100644 --- a/chrome/browser/safe_browsing/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection_service.cc @@ -12,9 +12,9 @@ #include "base/metrics/histogram.h" #include "base/sequenced_task_runner_helpers.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" diff --git a/chrome/browser/safe_browsing/download_protection_service_unittest.cc b/chrome/browser/safe_browsing/download_protection_service_unittest.cc index ab39113..4aef699 100644 --- a/chrome/browser/safe_browsing/download_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection_service_unittest.cc @@ -17,7 +17,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/safe_browsing/database_manager.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" diff --git a/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc b/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc index c25e4d7..48e5cb9 100644 --- a/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc +++ b/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "net/test/python_utils.h" #include "net/test/test_server.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index 2918edb..bb1aafb 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -13,9 +13,9 @@ #include "base/lazy_instance.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index 6f5098a..45d71d5 100644 --- a/chrome/browser/safe_browsing/safe_browsing_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc @@ -21,9 +21,9 @@ #include "base/environment.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/synchronization/lock.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" diff --git a/chrome/browser/search_engines/search_terms_data.cc b/chrome/browser/search_engines/search_terms_data.cc index 465b439..a1adfc9 100644 --- a/chrome/browser/search_engines/search_terms_data.cc +++ b/chrome/browser/search_engines/search_terms_data.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/metrics/field_trial.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/google/google_util.h" diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc index 320aab0..24abf88 100644 --- a/chrome/browser/search_engines/template_url.cc +++ b/chrome/browser/search_engines/template_url.cc @@ -11,9 +11,9 @@ #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/metrics/field_trial.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/search_engines/search_terms_data.h" diff --git a/chrome/browser/search_engines/template_url_fetcher.cc b/chrome/browser/search_engines/template_url_fetcher.cc index ce73e21..c6ce2d2 100644 --- a/chrome/browser/search_engines/template_url_fetcher.cc +++ b/chrome/browser/search_engines/template_url_fetcher.cc @@ -6,7 +6,7 @@ #include "chrome/browser/search_engines/template_url_fetcher.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" diff --git a/chrome/browser/search_engines/template_url_parser.cc b/chrome/browser/search_engines/template_url_parser.cc index 5b5eb83..8f6db40 100644 --- a/chrome/browser/search_engines/template_url_parser.cc +++ b/chrome/browser/search_engines/template_url_parser.cc @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc index 89ca632..5bbd669 100644 --- a/chrome/browser/search_engines/template_url_service.cc +++ b/chrome/browser/search_engines/template_url_service.cc @@ -13,9 +13,9 @@ #include "base/memory/scoped_vector.h" #include "base/metrics/histogram.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/google/google_url_tracker.h" diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc index b4529fb..f71319d 100644 --- a/chrome/browser/sessions/session_service_unittest.cc +++ b/chrome/browser/sessions/session_service_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_vector.h" #include "base/path_service.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.h" diff --git a/chrome/browser/sessions/session_types_unittest.cc b/chrome/browser/sessions/session_types_unittest.cc index e6a542d..c71d244 100644 --- a/chrome/browser/sessions/session_types_unittest.cc +++ b/chrome/browser/sessions/session_types_unittest.cc @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/pickle.h" #include "base/string16.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/sessions/session_types.h" diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc index 41cde76..06426d6 100644 --- a/chrome/browser/shell_integration_linux.cc +++ b/chrome/browser/shell_integration_linux.cc @@ -25,7 +25,7 @@ #include "base/path_service.h" #include "base/posix/eintr_wrapper.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/strings/string_tokenizer.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc index f0f6f77..378a3dc 100644 --- a/chrome/browser/shell_integration_win.cc +++ b/chrome/browser/shell_integration_win.cc @@ -13,9 +13,9 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" #include "base/win/scoped_comptr.h" diff --git a/chrome/browser/shell_integration_win_unittest.cc b/chrome/browser/shell_integration_win_unittest.cc index b8424f1..ba26853 100644 --- a/chrome/browser/shell_integration_win_unittest.cc +++ b/chrome/browser/shell_integration_win_unittest.cc @@ -9,7 +9,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/test/test_shortcut_win.h" #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" diff --git a/chrome/browser/signin/signin_internals_util.cc b/chrome/browser/signin/signin_internals_util.cc index a2a3960..ff1ded0 100644 --- a/chrome/browser/signin/signin_internals_util.cc +++ b/chrome/browser/signin/signin_internals_util.cc @@ -7,7 +7,7 @@ #include <sstream> #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/extensions/extension_messages.h" diff --git a/chrome/browser/speech/tts_win.cc b/chrome/browser/speech/tts_win.cc index 699a518..cb3a0c2 100644 --- a/chrome/browser/speech/tts_win.cc +++ b/chrome/browser/speech/tts_win.cc @@ -6,7 +6,7 @@ #include <sapi.h> #include "base/memory/singleton.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/win/scoped_comptr.h" diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc index 9b74128..40c0f09 100644 --- a/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc +++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc @@ -9,8 +9,9 @@ #include "base/file_util.h" #include "base/files/important_file_writer.h" #include "base/md5.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/strings/string_number_conversions.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/spellcheck_messages.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc index 49851b1..825b1f1 100644 --- a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc +++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc @@ -5,7 +5,7 @@ #include <vector> #include "base/file_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/spellchecker/spellcheck_custom_dictionary.h" #include "chrome/browser/spellchecker/spellcheck_factory.h" #include "chrome/browser/spellchecker/spellcheck_service.h" diff --git a/chrome/browser/ssl/ssl_tab_helper.cc b/chrome/browser/ssl/ssl_tab_helper.cc index 94f4b1e..886db8a 100644 --- a/chrome/browser/ssl/ssl_tab_helper.cc +++ b/chrome/browser/ssl/ssl_tab_helper.cc @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" diff --git a/chrome/browser/status_icons/desktop_notification_balloon.cc b/chrome/browser/status_icons/desktop_notification_balloon.cc index 0bcd285..09b3124 100644 --- a/chrome/browser/status_icons/desktop_notification_balloon.cc +++ b/chrome/browser/status_icons/desktop_notification_balloon.cc @@ -5,7 +5,7 @@ #include "chrome/browser/status_icons/desktop_notification_balloon.h" #include "base/bind.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/notifications/desktop_notification_service.h" diff --git a/chrome/browser/sync/backend_migrator.cc b/chrome/browser/sync/backend_migrator.cc index e6c5002..e960c35 100644 --- a/chrome/browser/sync/backend_migrator.cc +++ b/chrome/browser/sync/backend_migrator.cc @@ -5,7 +5,7 @@ #include "chrome/browser/sync/backend_migrator.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/tracked_objects.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc index cf2b3dd..a78b350 100644 --- a/chrome/browser/sync/glue/bookmark_change_processor.cc +++ b/chrome/browser/sync/glue/bookmark_change_processor.cc @@ -9,8 +9,8 @@ #include "base/location.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc index 9f0fbe2..cec355a 100644 --- a/chrome/browser/sync/glue/bookmark_model_associator.cc +++ b/chrome/browser/sync/glue/bookmark_model_associator.cc @@ -11,7 +11,7 @@ #include "base/hash_tables.h" #include "base/location.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/sync/glue/generic_change_processor.cc b/chrome/browser/sync/glue/generic_change_processor.cc index c12e34f..37a0138 100644 --- a/chrome/browser/sync/glue/generic_change_processor.cc +++ b/chrome/browser/sync/glue/generic_change_processor.cc @@ -5,7 +5,7 @@ #include "chrome/browser/sync/glue/generic_change_processor.h" #include "base/location.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "content/public/browser/browser_thread.h" #include "sync/api/sync_change.h" diff --git a/chrome/browser/sync/invalidations/invalidator_storage.cc b/chrome/browser/sync/invalidations/invalidator_storage.cc index 96cc0c9..cb394bd 100644 --- a/chrome/browser/sync/invalidations/invalidator_storage.cc +++ b/chrome/browser/sync/invalidations/invalidator_storage.cc @@ -10,7 +10,7 @@ #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/task_runner.h" #include "base/values.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/sync/invalidations/invalidator_storage_unittest.cc b/chrome/browser/sync/invalidations/invalidator_storage_unittest.cc index 03a9c49..a47adff 100644 --- a/chrome/browser/sync/invalidations/invalidator_storage_unittest.cc +++ b/chrome/browser/sync/invalidations/invalidator_storage_unittest.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service.h" diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc index f5af4eb..337b928 100644 --- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc @@ -18,8 +18,8 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc index 62d1112..3174957 100644 --- a/chrome/browser/sync/sync_prefs.cc +++ b/chrome/browser/sync/sync_prefs.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/prefs/public/pref_member.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/sync/test/integration/apps_helper.cc b/chrome/browser/sync/test/integration/apps_helper.cc index 26ff792..e07ffcc 100644 --- a/chrome/browser/sync/test/integration/apps_helper.cc +++ b/chrome/browser/sync/test/integration/apps_helper.cc @@ -5,7 +5,7 @@ #include "chrome/browser/sync/test/integration/apps_helper.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/sync_app_helper.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc index c7fcf14..62dd5c9 100644 --- a/chrome/browser/sync/test/integration/bookmarks_helper.cc +++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc @@ -8,9 +8,9 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/rand_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -25,8 +25,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/glue/bookmark_change_processor.h" #include "chrome/browser/sync/profile_sync_service_harness.h" -#include "chrome/browser/sync/test/integration/sync_test.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" +#include "chrome/browser/sync/test/integration/sync_test.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/ui_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/test/integration/extensions_helper.cc b/chrome/browser/sync/test/integration/extensions_helper.cc index e002eb5..0226c5c 100644 --- a/chrome/browser/sync/test/integration/extensions_helper.cc +++ b/chrome/browser/sync/test/integration/extensions_helper.cc @@ -7,8 +7,8 @@ #include <cstring> #include "base/logging.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "chrome/browser/sync/test/integration/sync_extension_helper.h" diff --git a/chrome/browser/sync/test/integration/multiple_client_dictionary_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_dictionary_sync_test.cc index 58e47f9..a0c1548 100644 --- a/chrome/browser/sync/test/integration/multiple_client_dictionary_sync_test.cc +++ b/chrome/browser/sync/test/integration/multiple_client_dictionary_sync_test.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_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/sync/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/dictionary_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h" diff --git a/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc index 2067ebc..4b54ded 100644 --- a/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc +++ b/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.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_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/sync/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/dictionary_helper.h" #include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h" diff --git a/chrome/browser/sync/test/integration/performance/sync_timing_helper.cc b/chrome/browser/sync/test/integration/performance/sync_timing_helper.cc index 4ebc56d..6a0b4ee 100644 --- a/chrome/browser/sync/test/integration/performance/sync_timing_helper.cc +++ b/chrome/browser/sync/test/integration/performance/sync_timing_helper.cc @@ -4,7 +4,7 @@ #include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "chrome/browser/sync/profile_sync_service_harness.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/test/integration/themes_helper.cc b/chrome/browser/sync/test/integration/themes_helper.cc index 28668c6..67b41ff 100644 --- a/chrome/browser/sync/test/integration/themes_helper.cc +++ b/chrome/browser/sync/test/integration/themes_helper.cc @@ -5,11 +5,14 @@ #include "chrome/browser/sync/test/integration/themes_helper.h" #include "base/logging.h" -#include "base/string_number_conversions.h" -#include "chrome/browser/themes/theme_service.h" -#include "chrome/browser/themes/theme_service_factory.h" +#include "base/strings/string_number_conversions.h" +#include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "chrome/browser/sync/test/integration/sync_extension_helper.h" +#include "chrome/browser/sync/test/integration/sync_extension_helper.h" +#include "chrome/browser/themes/theme_service.h" +#include "chrome/browser/themes/theme_service_factory.h" +#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest.h" using sync_datatype_helper::test; diff --git a/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc b/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc index 637b38f..851ee6e 100644 --- a/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.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_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/sync/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/dictionary_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h" diff --git a/chrome/browser/sync_file_system/drive_metadata_store.cc b/chrome/browser/sync_file_system/drive_metadata_store.cc index 6279c40..bae9920 100644 --- a/chrome/browser/sync_file_system/drive_metadata_store.cc +++ b/chrome/browser/sync_file_system/drive_metadata_store.cc @@ -14,8 +14,8 @@ #include "base/message_loop_proxy.h" #include "base/sequenced_task_runner.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/task_runner_util.h" #include "chrome/browser/sync_file_system/drive_file_sync_service.h" #include "chrome/browser/sync_file_system/sync_file_system.pb.h" diff --git a/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc b/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc index 490d9ed..cc43142 100644 --- a/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc +++ b/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.cc @@ -6,8 +6,8 @@ #include "base/file_path.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/system_monitor/media_storage_util.h" #include "chrome/browser/system_monitor/removable_device_constants.h" diff --git a/chrome/browser/system_monitor/removable_device_notifications_chromeos.cc b/chrome/browser/system_monitor/removable_device_notifications_chromeos.cc index 14b5330..7378f5b 100644 --- a/chrome/browser/system_monitor/removable_device_notifications_chromeos.cc +++ b/chrome/browser/system_monitor/removable_device_notifications_chromeos.cc @@ -9,8 +9,8 @@ #include "base/file_path.h" #include "base/logging.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/system_monitor/media_device_notifications_utils.h" #include "chrome/browser/system_monitor/media_storage_util.h" diff --git a/chrome/browser/system_monitor/removable_device_notifications_linux.cc b/chrome/browser/system_monitor/removable_device_notifications_linux.cc index 4e57eab..5f33410 100644 --- a/chrome/browser/system_monitor/removable_device_notifications_linux.cc +++ b/chrome/browser/system_monitor/removable_device_notifications_linux.cc @@ -16,8 +16,9 @@ #include "base/file_path.h" #include "base/metrics/histogram.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" +#include "base/system_monitor/system_monitor.h" #include "base/utf_string_conversions.h" #include "chrome/browser/system_monitor/media_device_notifications_utils.h" #include "chrome/browser/system_monitor/media_storage_util.h" diff --git a/chrome/browser/system_monitor/volume_mount_watcher_win.cc b/chrome/browser/system_monitor/volume_mount_watcher_win.cc index 57c04f8..137ceec 100644 --- a/chrome/browser/system_monitor/volume_mount_watcher_win.cc +++ b/chrome/browser/system_monitor/volume_mount_watcher_win.cc @@ -9,8 +9,8 @@ #include <fileapi.h> #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/system_monitor/media_device_notifications_utils.h" #include "chrome/browser/system_monitor/media_storage_util.h" diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index ec9662e..6079119 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -11,8 +11,8 @@ #include "base/process_util.h" #include "base/rand_util.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/background/background_contents_service.h" diff --git a/chrome/browser/task_profiler/task_profiler_data_serializer_unittest.cc b/chrome/browser/task_profiler/task_profiler_data_serializer_unittest.cc index 5b8e56f..c277e22 100644 --- a/chrome/browser/task_profiler/task_profiler_data_serializer_unittest.cc +++ b/chrome/browser/task_profiler/task_profiler_data_serializer_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/json/json_writer.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/tracked_objects.h" #include "base/values.h" #include "chrome/browser/task_profiler/task_profiler_data_serializer.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc index 6f87bb6..c2e1ea6 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc @@ -11,7 +11,7 @@ #include "ash/shell.h" #include "ash/wm/window_util.h" #include "base/command_line.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/defaults.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc index 5823c01..8c6d199 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc @@ -10,7 +10,7 @@ #include "ash/shell.h" #include "ash/wm/window_util.h" #include "base/command_line.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/defaults.h" diff --git a/chrome/browser/ui/autofill/autofill_dialog_models.cc b/chrome/browser/ui/autofill/autofill_dialog_models.cc index 5bba2f3..30fa0e1 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_models.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_models.cc @@ -4,8 +4,8 @@ #include "chrome/browser/ui/autofill/autofill_dialog_models.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc index ede451e..bbdd283 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils.cc +++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/prefs/public/pref_service_base.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 6571727..2e76430 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -19,9 +19,9 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/process_info.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc index b4bb164..e75a930 100644 --- a/chrome/browser/ui/browser_focus_uitest.cc +++ b/chrome/browser/ui/browser_focus_uitest.cc @@ -9,8 +9,8 @@ #include "base/format_macros.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" @@ -26,8 +26,8 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" -#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/in_process_browser_test.h" +#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/interstitial_page.h" #include "content/public/browser/interstitial_page_delegate.h" @@ -49,8 +49,8 @@ #endif #if defined(OS_WIN) -#include <Psapi.h> #include <windows.h> +#include <Psapi.h> #include "base/string_util.h" #endif diff --git a/chrome/browser/ui/browser_window_state.cc b/chrome/browser/ui/browser_window_state.cc index 7427018..a0e6e0a 100644 --- a/chrome/browser/ui/browser_window_state.cc +++ b/chrome/browser/ui/browser_window_state.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/browser_window_state.h" #include "base/command_line.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/defaults.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc index a2fbf0e..4cdf442 100644 --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/chrome_pages.h" #include "base/logging.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/download/download_shelf.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/signin_manager.h" diff --git a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm index e528c35..d7535cf 100644 --- a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/string_number_conversions.h" -#include "chrome/browser/system_monitor/media_storage_util.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/media_gallery/media_galleries_dialog_controller_mock.h" +#include "chrome/browser/system_monitor/media_storage_util.h" #include "chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm index c2c4c7e..6cd19f5 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm @@ -5,8 +5,8 @@ #import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h" #include "base/logging.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/sys_string_conversions.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm index ac1d1bf..2af915b 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" // IDC_HISTORY_MENU #import "chrome/browser/app_controller_mac.h" diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm index 6e0e4a0..f0b3539 100644 --- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm @@ -5,7 +5,7 @@ #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h" #include "base/string16.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" diff --git a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm index 2f038d6..af27be4 100644 --- a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm @@ -8,7 +8,7 @@ #import <AppKit/AppKit.h> -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/sys_string_conversions.h" #include "chrome/browser/api/infobars/infobar_service.h" #import "chrome/browser/certificate_viewer.h" diff --git a/chrome/browser/ui/gtk/certificate_viewer_gtk.cc b/chrome/browser/ui/gtk/certificate_viewer_gtk.cc index 6c6a495..6d01b64 100644 --- a/chrome/browser/ui/gtk/certificate_viewer_gtk.cc +++ b/chrome/browser/ui/gtk/certificate_viewer_gtk.cc @@ -10,7 +10,7 @@ #include "base/i18n/time_formatting.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/certificate_viewer.h" diff --git a/chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.cc b/chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.cc index 8d30d40..3d6511ad 100644 --- a/chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/download/download_in_progress_dialog_gtk.cc @@ -7,7 +7,7 @@ #include <gtk/gtk.h> #include "base/string16.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk_unittest.cc b/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk_unittest.cc index 9d39f4f..90de07b 100644 --- a/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk_unittest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/string_number_conversions.h" -#include "chrome/browser/system_monitor/media_storage_util.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/media_gallery/media_galleries_dialog_controller_mock.h" +#include "chrome/browser/system_monitor/media_storage_util.h" #include "chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc index 772e567..754be61 100644 --- a/chrome/browser/ui/gtk/find_bar_gtk.cc +++ b/chrome/browser/ui/gtk/find_bar_gtk.cc @@ -12,8 +12,8 @@ #include "base/debug/trace_event.h" #include "base/i18n/rtl.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/gtk/global_history_menu.cc b/chrome/browser/ui/gtk/global_history_menu.cc index cac0d3f..da94e63 100644 --- a/chrome/browser/ui/gtk/global_history_menu.cc +++ b/chrome/browser/ui/gtk/global_history_menu.cc @@ -10,7 +10,7 @@ #include "base/bind_helpers.h" #include "base/memory/weak_ptr.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/top_sites.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc index 974af6f..eedb5be 100644 --- a/chrome/browser/ui/gtk/gtk_util.cc +++ b/chrome/browser/ui/gtk/gtk_util.cc @@ -14,7 +14,7 @@ #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/nix/xdg_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc index 5abe132..eb2d8643 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc @@ -15,8 +15,8 @@ #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/accessibility/accessibility_events.h" diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc b/chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc index 5c53cf5..f5fb69c 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc +++ b/chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc @@ -4,7 +4,7 @@ #include <gtk/gtk.h> -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/ui/gtk/script_bubble_gtk.cc b/chrome/browser/ui/gtk/script_bubble_gtk.cc index bc8c8e9..d4059c9 100644 --- a/chrome/browser/ui/gtk/script_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/script_bubble_gtk.cc @@ -8,7 +8,7 @@ #include <vector> #include "base/i18n/rtl.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/image_loader.h" diff --git a/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc b/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc index a3202af..8396206 100644 --- a/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc +++ b/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.h" #include "base/i18n/rtl.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/certificate_viewer.h" @@ -15,8 +15,8 @@ #include "chrome/browser/ui/gtk/browser_window_gtk.h" #include "chrome/browser/ui/gtk/collected_cookies_gtk.h" #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" -#include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" +#include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/location_bar_view_gtk.h" #include "chrome/browser/ui/gtk/nine_box.h" #include "chrome/browser/ui/gtk/website_settings/permission_selector.h" diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc index fc7f539..123ea9c 100644 --- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc +++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc @@ -11,8 +11,8 @@ #include "base/nix/mime_util_xdg.h" #include "base/nix/xdg_util.h" #include "base/process_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h" diff --git a/chrome/browser/ui/metro_pin_tab_helper_win.cc b/chrome/browser/ui/metro_pin_tab_helper_win.cc index 2a236c2..daf6c21 100644 --- a/chrome/browser/ui/metro_pin_tab_helper_win.cc +++ b/chrome/browser/ui/metro_pin_tab_helper_win.cc @@ -15,7 +15,7 @@ #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/win/metro.h" #include "chrome/browser/favicon/favicon_tab_helper.h" diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc index 4846a55..9918dad 100644 --- a/chrome/browser/ui/panels/base_panel_browser_test.cc +++ b/chrome/browser/ui/panels/base_panel_browser_test.cc @@ -9,7 +9,7 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/ui/pdf/pdf_browsertest.cc b/chrome/browser/ui/pdf/pdf_browsertest.cc index d42c169..35d6bab 100644 --- a/chrome/browser/ui/pdf/pdf_browsertest.cc +++ b/chrome/browser/ui/pdf/pdf_browsertest.cc @@ -5,8 +5,8 @@ #include "base/file_util.h" #include "base/hash.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/ui/search/search.cc b/chrome/browser/ui/search/search.cc index da65ed1..a39700e 100644 --- a/chrome/browser/ui/search/search.cc +++ b/chrome/browser/ui/search/search.cc @@ -6,9 +6,9 @@ #include "base/command_line.h" #include "base/metrics/field_trial.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index 507adba..f89ae71 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc @@ -18,8 +18,8 @@ #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/app_mode/app_mode_utils.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc index 6625844..0c087d0 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -19,8 +19,8 @@ #include "base/metrics/histogram.h" #include "base/metrics/statistics_recorder.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/api/infobars/infobar_service.h" diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc index 4da9258..22441a5 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc @@ -12,9 +12,9 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/tab_helper.h" diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc index ae76d4c..2f57970 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc @@ -8,7 +8,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc b/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc index 2c34ef8..a9fbc6d 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h" #include "base/rand_util.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/sync/glue/session_model_associator.h" #include "sync/protocol/session_specifics.pb.h" diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc index 22a9f2b..065dcbb 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" #include "base/bind.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/favicon/favicon_service_factory.h" diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index c24ce72..8244e05 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -9,8 +9,8 @@ #include "base/command_line.h" #include "base/i18n/number_formatting.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 4c938b3..1f271fb 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -5,7 +5,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.cc b/chrome/browser/ui/views/critical_notification_bubble_view.cc index 40b487a..e923a43 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.cc +++ b/chrome/browser/ui/views/critical_notification_bubble_view.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/critical_notification_bubble_view.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/lifetime/application_lifetime.h" diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc index a62f88f..7f5fe5e 100644 --- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc +++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/ui/browser.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/extensions/disabled_extensions_view.cc b/chrome/browser/ui/views/extensions/disabled_extensions_view.cc index d597604..4784ac0 100644 --- a/chrome/browser/ui/views/extensions/disabled_extensions_view.cc +++ b/chrome/browser/ui/views/extensions/disabled_extensions_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/extensions/disabled_extensions_view.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" @@ -25,8 +25,8 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/views/bubble/bubble_border.h" #include "ui/views/controls/button/text_button.h" -#include "ui/views/controls/label.h" #include "ui/views/controls/image_view.h" +#include "ui/views/controls/label.h" #include "ui/views/controls/link.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index 8bb1434..9074963 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -6,8 +6,8 @@ #include <algorithm> -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 8445fc3..552df0f 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -10,7 +10,7 @@ #include "base/command_line.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/app/chrome_dll_resource.h" diff --git a/chrome/browser/ui/views/location_bar/script_bubble_icon_view.cc b/chrome/browser/ui/views/location_bar/script_bubble_icon_view.cc index 0f9d433..21b6489 100644 --- a/chrome/browser/ui/views/location_bar/script_bubble_icon_view.cc +++ b/chrome/browser/ui/views/location_bar/script_bubble_icon_view.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/location_bar/script_bubble_icon_view.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/script_bubble_view.h" #include "chrome/common/extensions/api/extension_action/action_info.h" diff --git a/chrome/browser/ui/views/status_icons/status_icon_win.cc b/chrome/browser/ui/views/status_icons/status_icon_win.cc index e095207..2c2166d 100644 --- a/chrome/browser/ui/views/status_icons/status_icon_win.cc +++ b/chrome/browser/ui/views/status_icons/status_icon_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/status_icons/status_icon_win.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/win/metro.h" #include "base/win/windows_version.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/ui/views/tabs/stacked_tab_strip_layout.cc b/chrome/browser/ui/views/tabs/stacked_tab_strip_layout.cc index c5e5ae1..88a83ce 100644 --- a/chrome/browser/ui/views/tabs/stacked_tab_strip_layout.cc +++ b/chrome/browser/ui/views/tabs/stacked_tab_strip_layout.cc @@ -7,7 +7,7 @@ #include <stdio.h> #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" StackedTabStripLayout::StackedTabStripLayout(const gfx::Size& size, int padding, diff --git a/chrome/browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc b/chrome/browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc index a93f231..523f8a9 100644 --- a/chrome/browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc +++ b/chrome/browser/ui/views/tabs/stacked_tab_strip_layout_unittest.cc @@ -6,8 +6,8 @@ #include <string> -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/view.h" #include "ui/views/view_model.h" diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc index 375db01..782ae4e 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/run_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -19,8 +19,8 @@ #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" -#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/in_process_browser_test.h" +#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_controls.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_details.h" @@ -39,8 +39,8 @@ #include "ash/test/cursor_manager_test_api.h" #include "ash/wm/cursor_manager.h" #include "ash/wm/window_util.h" -#include "ui/aura/test/event_generator.h" #include "ui/aura/root_window.h" +#include "ui/aura/test/event_generator.h" #endif using content::WebContents; diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc index 52146ba..385c007 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/command_line.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" @@ -18,8 +18,8 @@ #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" -#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/in_process_browser_test.h" +#include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_controls.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc index 8ac96c1..f68dc04 100644 --- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc +++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/certificate_viewer.h" diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index 2b2ad2a..b80a4f7 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -8,7 +8,7 @@ #include <cmath> #include <set> -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc index 1f64254..8d672c2e 100644 --- a/chrome/browser/ui/website_settings/website_settings.cc +++ b/chrome/browser/ui/website_settings/website_settings.cc @@ -9,9 +9,9 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/metrics/histogram.h" #include "base/i18n/time_formatting.h" -#include "base/string_number_conversions.h" +#include "base/metrics/histogram.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/api/infobars/infobar_service.h" diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index d87b5ad..46806d6 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -20,10 +20,10 @@ #include "base/metrics/statistics_recorder.h" #include "base/metrics/stats_table.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.cc b/chrome/browser/ui/webui/certificate_viewer_webui.cc index b955651..2b1ccab 100644 --- a/chrome/browser/ui/webui/certificate_viewer_webui.cc +++ b/chrome/browser/ui/webui/certificate_viewer_webui.cc @@ -8,7 +8,7 @@ #include "base/bind_helpers.h" #include "base/i18n/time_formatting.h" #include "base/json/json_writer.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/ui/browser_dialogs.h" diff --git a/chrome/browser/ui/webui/chromeos/about_network.cc b/chrome/browser/ui/webui/chromeos/about_network.cc index 0a108b1..43b365c 100644 --- a/chrome/browser/ui/webui/chromeos/about_network.cc +++ b/chrome/browser/ui/webui/chromeos/about_network.cc @@ -6,7 +6,7 @@ #include "ash/ash_switches.h" #include "base/command_line.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" diff --git a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc index 5c638f2..dccfb28 100644 --- a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc +++ b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/logging.h" -#include "base/string_number_conversions.h" #include "base/string_piece.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc index fae49c9..92e5f84 100644 --- a/chrome/browser/ui/webui/conflicts_ui.cc +++ b/chrome/browser/ui/webui/conflicts_ui.cc @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/memory/ref_counted_memory.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/enumerate_modules_model_win.h" diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.cc b/chrome/browser/ui/webui/cookies_tree_model_util.cc index ba0440e..4b7e10a 100644 --- a/chrome/browser/ui/webui/cookies_tree_model_util.cc +++ b/chrome/browser/ui/webui/cookies_tree_model_util.cc @@ -8,9 +8,9 @@ #include "base/i18n/time_formatting.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/browsing_data/cookies_tree_model.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index 0d0dd47..d84023d 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc @@ -8,10 +8,10 @@ #include "base/bind_helpers.h" #include "base/memory/ref_counted_memory.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index dd517f7..f688818 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -10,8 +10,8 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/file_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/version.h" diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc index c498b33..9f90270 100644 --- a/chrome/browser/ui/webui/favicon_source.cc +++ b/chrome/browser/ui/webui/favicon_source.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/top_sites.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/webui/feedback_ui.cc b/chrome/browser/ui/webui/feedback_ui.cc index 7950cb1..e3c7c77 100644 --- a/chrome/browser/ui/webui/feedback_ui.cc +++ b/chrome/browser/ui/webui/feedback_ui.cc @@ -13,8 +13,8 @@ #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc index 1f1f2d6..ac26713 100644 --- a/chrome/browser/ui/webui/flash_ui.cc +++ b/chrome/browser/ui/webui/flash_ui.cc @@ -13,8 +13,8 @@ #include "base/i18n/time_formatting.h" #include "base/memory/weak_ptr.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/timer.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc index 7b153cd..33b1a5b 100644 --- a/chrome/browser/ui/webui/history_ui.cc +++ b/chrome/browser/ui/webui/history_ui.cc @@ -14,8 +14,8 @@ #include "base/memory/singleton.h" #include "base/message_loop.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_piece.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/webui/inspect_ui.cc b/chrome/browser/ui/webui/inspect_ui.cc index 4f9e41f..0aa1ab1 100644 --- a/chrome/browser/ui/webui/inspect_ui.cc +++ b/chrome/browser/ui/webui/inspect_ui.cc @@ -10,8 +10,8 @@ #include "base/bind_helpers.h" #include "base/json/json_writer.h" #include "base/memory/ref_counted_memory.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/devtools/devtools_window.h" diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc index 8ecb6e9..f59c029 100644 --- a/chrome/browser/ui/webui/nacl_ui.cc +++ b/chrome/browser/ui/webui/nacl_ui.cc @@ -14,7 +14,7 @@ #include "base/memory/weak_ptr.h" #include "base/path_service.h" #include "base/string16.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/plugins/plugin_prefs.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index af415eb..a002b7c 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -21,10 +21,10 @@ #include "base/platform_file.h" #include "base/prefs/public/pref_member.h" #include "base/sequenced_task_runner_helpers.h" -#include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/worker_pool.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc b/chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc index 606f8dc..ecc2879 100644 --- a/chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc +++ b/chrome/browser/ui/webui/ntp/android/bookmarks_handler.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/memory/ref_counted_memory.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/android/tab_android.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/ui/webui/ntp/android/promo_handler.cc b/chrome/browser/ui/webui/ntp/android/promo_handler.cc index 14b6b93..7d5ffa7 100644 --- a/chrome/browser/ui/webui/ntp/android/promo_handler.cc +++ b/chrome/browser/ui/webui/ntp/android/promo_handler.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/android/intent_helper.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc index 6343abc..34ddc8a 100644 --- a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc +++ b/chrome/browser/ui/webui/ntp/foreign_session_handler.cc @@ -12,7 +12,7 @@ #include "base/bind_helpers.h" #include "base/i18n/time_formatting.h" #include "base/memory/scoped_vector.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.cc b/chrome/browser/ui/webui/ntp/most_visited_handler.cc index e4409b2..6e374e3 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_handler.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_handler.cc @@ -14,7 +14,7 @@ #include "base/memory/singleton.h" #include "base/metrics/histogram.h" #include "base/string16.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index 18e79bc..21996a4 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -15,7 +15,7 @@ #include "base/lazy_instance.h" #include "base/memory/singleton.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index 8bdee4b..277b44de 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -11,8 +11,8 @@ #include "base/file_util.h" #include "base/memory/ref_counted_memory.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/ui/webui/ntp/suggestions_source_top_sites.cc b/chrome/browser/ui/webui/ntp/suggestions_source_top_sites.cc index f8aa6a9..06a54e5 100644 --- a/chrome/browser/ui/webui/ntp/suggestions_source_top_sites.cc +++ b/chrome/browser/ui/webui/ntp/suggestions_source_top_sites.cc @@ -8,12 +8,12 @@ #include "base/bind_helpers.h" #include "base/command_line.h" #include "base/stl_util.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" -#include "base/string_number_conversions.h" +#include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/top_sites.h" #include "chrome/browser/history/visit_filter.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "chrome/browser/ui/webui/ntp/suggestions_combiner.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc index 94ae8d6..4b83a00 100644 --- a/chrome/browser/ui/webui/options/autofill_options_handler.cc +++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc @@ -11,7 +11,7 @@ #include "base/guid.h" #include "base/logging.h" #include "base/string16.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/autofill/autofill_country.h" diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index 7159b3e..538a92d 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -14,7 +14,7 @@ #include "base/memory/singleton.h" #include "base/path_service.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/value_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc index a02e5f9..50a578b 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc @@ -13,7 +13,7 @@ #include "base/id_map.h" #include "base/memory/scoped_vector.h" #include "base/safe_strerror_posix.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/certificate_viewer.h" diff --git a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc index 5cb65fd..25a36b5 100644 --- a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc @@ -8,7 +8,7 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/command_line.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc index 794f1692..944e3d3 100644 --- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "base/prefs/public/pref_change_registrar.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/user_manager.h" diff --git a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc index d2ab7ad..7fcbc34 100644 --- a/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.cc @@ -13,7 +13,8 @@ #include "ash/shell.h" #include "base/bind.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/display/display_preferences.h" #include "chromeos/display/output_configurator.h" diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc index 625a95d..9e75a4c 100644 --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc @@ -20,8 +20,8 @@ #include "base/i18n/time_formatting.h" #include "base/json/json_writer.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/options/chromeos/language_chewing_handler.cc b/chrome/browser/ui/webui/options/chromeos/language_chewing_handler.cc index 5bc2810..2b19db7 100644 --- a/chrome/browser/ui/webui/options/chromeos/language_chewing_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/language_chewing_handler.cc @@ -7,7 +7,7 @@ #include <limits> #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/language_preferences.h" diff --git a/chrome/browser/ui/webui/options/chromeos/language_mozc_handler.cc b/chrome/browser/ui/webui/options/chromeos/language_mozc_handler.cc index 6ebc145..e858395 100644 --- a/chrome/browser/ui/webui/options/chromeos/language_mozc_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/language_mozc_handler.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/options/chromeos/language_mozc_handler.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/language_preferences.h" diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc index dd22f0c..b09463d 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.cc +++ b/chrome/browser/ui/webui/options/core_options_handler.cc @@ -9,7 +9,7 @@ #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/ui/webui/options/font_settings_handler.cc b/chrome/browser/ui/webui/options/font_settings_handler.cc index 245d844..f415f60 100644 --- a/chrome/browser/ui/webui/options/font_settings_handler.cc +++ b/chrome/browser/ui/webui/options/font_settings_handler.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/i18n/rtl.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" diff --git a/chrome/browser/ui/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc index b981e15..bbaedfb 100644 --- a/chrome/browser/ui/webui/options/import_data_handler.cc +++ b/chrome/browser/ui/webui/options/import_data_handler.cc @@ -11,8 +11,8 @@ #include "base/bind_helpers.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc index 025ca6a..8005629 100644 --- a/chrome/browser/ui/webui/options/manage_profile_handler.cc +++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/value_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/options/media_galleries_handler.cc b/chrome/browser/ui/webui/options/media_galleries_handler.cc index a4632f0..3628be1 100644 --- a/chrome/browser/ui/webui/options/media_galleries_handler.cc +++ b/chrome/browser/ui/webui/options/media_galleries_handler.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/webui/options/media_galleries_handler.h" #include "base/bind.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/media_gallery/media_file_system_registry.h" #include "chrome/browser/media_gallery/media_galleries_preferences.h" diff --git a/chrome/browser/ui/webui/options/password_manager_handler.cc b/chrome/browser/ui/webui/options/password_manager_handler.cc index ca57a68..1f5911c 100644 --- a/chrome/browser/ui/webui/options/password_manager_handler.cc +++ b/chrome/browser/ui/webui/options/password_manager_handler.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/webui/options/password_manager_handler.h" #include "base/bind.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/password_manager/password_store_factory.h" diff --git a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc index 1827883..5c0c1fb 100644 --- a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc +++ b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h" #include "base/bind.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/ui/webui/options/startup_pages_handler.cc b/chrome/browser/ui/webui/options/startup_pages_handler.cc index 74979d5..c3f1998 100644 --- a/chrome/browser/ui/webui/options/startup_pages_handler.cc +++ b/chrome/browser/ui/webui/options/startup_pages_handler.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" #include "chrome/browser/autocomplete/autocomplete_controller.h" #include "chrome/browser/autocomplete/autocomplete_input.h" diff --git a/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util_unittest.cc b/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util_unittest.cc index 0698375..92e379e 100644 --- a/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util_unittest.cc +++ b/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util_unittest.cc @@ -4,8 +4,8 @@ #include <string> +#include "base/strings/string_number_conversions.h" #include "base/time.h" -#include "base/string_number_conversions.h" #include "chrome/browser/performance_monitor/metric.h" #include "chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc index f9ae6b1..1ee292d 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc @@ -10,9 +10,9 @@ #include "base/lazy_instance.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/synchronization/lock.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc b/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc index dd8a79e..7f86f72 100644 --- a/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc +++ b/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc @@ -5,9 +5,9 @@ #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "base/command_line.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/first_run/first_run.h" @@ -25,6 +25,7 @@ #include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h" #include "chrome/browser/ui/webui/theme_source.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/net/url_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/ui/webui/task_manager/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc index 93dc65f..281b3b5 100644 --- a/chrome/browser/ui/webui/task_manager/task_manager_handler.cc +++ b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/task_manager/task_manager.h" @@ -21,8 +21,8 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "ui/gfx/image/image_skia.h" -#include "webkit/glue/webpreferences.h" #include "ui/webui/web_ui_util.h" +#include "webkit/glue/webpreferences.h" namespace { diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index d43ef38..022e7a5 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -6,7 +6,7 @@ #include "base/memory/ref_counted_memory.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/resources_util.h" #include "chrome/browser/themes/theme_service.h" diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc index 570275e..b5f058e 100644 --- a/chrome/browser/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector_impl.cc @@ -12,8 +12,8 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/web_resource/notification_promo.cc b/chrome/browser/web_resource/notification_promo.cc index 71f9d0d..c4f03da 100644 --- a/chrome/browser/web_resource/notification_promo.cc +++ b/chrome/browser/web_resource/notification_promo.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/rand_util.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/sys_info.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" diff --git a/chrome/browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc b/chrome/browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc index 44910d8..81aef5e 100644 --- a/chrome/browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc +++ b/chrome/browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc @@ -6,7 +6,7 @@ #include "base/json/json_reader.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/web_resource/promo_resource_service_unittest.cc b/chrome/browser/web_resource/promo_resource_service_unittest.cc index dfbb5c7..65b0f2c 100644 --- a/chrome/browser/web_resource/promo_resource_service_unittest.cc +++ b/chrome/browser/web_resource/promo_resource_service_unittest.cc @@ -7,8 +7,8 @@ #include "base/json/json_reader.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc index 1701f6d..c37f1cd 100644 --- a/chrome/browser/web_resource/web_resource_service.cc +++ b/chrome/browser/web_resource/web_resource_service.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/webdata/autofill_table.cc b/chrome/browser/webdata/autofill_table.cc index 9906ee3..a08cfe7 100644 --- a/chrome/browser/webdata/autofill_table.cc +++ b/chrome/browser/webdata/autofill_table.cc @@ -14,7 +14,7 @@ #include "base/guid.h" #include "base/i18n/case_conversion.h" #include "base/logging.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/tuple.h" #include "chrome/browser/autofill/autofill_country.h" diff --git a/chrome/browser/webdata/autofill_table_unittest.cc b/chrome/browser/webdata/autofill_table_unittest.cc index 5f6835a..e693d14 100644 --- a/chrome/browser/webdata/autofill_table_unittest.cc +++ b/chrome/browser/webdata/autofill_table_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/guid.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_profile.h" diff --git a/chrome/browser/webdata/keyword_table.cc b/chrome/browser/webdata/keyword_table.cc index 6e4b47e..c1bb75e 100644 --- a/chrome/browser/webdata/keyword_table.cc +++ b/chrome/browser/webdata/keyword_table.cc @@ -10,9 +10,9 @@ #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/history/history_database.h" diff --git a/chrome/browser/webdata/keyword_table_unittest.cc b/chrome/browser/webdata/keyword_table_unittest.cc index e78b19e..4ddeda4 100644 --- a/chrome/browser/webdata/keyword_table_unittest.cc +++ b/chrome/browser/webdata/keyword_table_unittest.cc @@ -9,7 +9,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/stl_util.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/search_engines/template_url.h" diff --git a/chrome/browser/webdata/token_service_table_unittest.cc b/chrome/browser/webdata/token_service_table_unittest.cc index 0b1e3ec..feb09d0 100644 --- a/chrome/browser/webdata/token_service_table_unittest.cc +++ b/chrome/browser/webdata/token_service_table_unittest.cc @@ -5,7 +5,7 @@ #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "chrome/browser/webdata/token_service_table.h" #include "chrome/browser/webdata/web_database.h" diff --git a/chrome/browser/webdata/web_apps_table_unittest.cc b/chrome/browser/webdata/web_apps_table_unittest.cc index 837c488..0682b6c 100644 --- a/chrome/browser/webdata/web_apps_table_unittest.cc +++ b/chrome/browser/webdata/web_apps_table_unittest.cc @@ -5,7 +5,7 @@ #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "chrome/browser/webdata/web_apps_table.h" #include "chrome/browser/webdata/web_database.h" diff --git a/chrome/browser/webdata/web_database_migration_unittest.cc b/chrome/browser/webdata/web_database_migration_unittest.cc index 054aa93..b834a65 100644 --- a/chrome/browser/webdata/web_database_migration_unittest.cc +++ b/chrome/browser/webdata/web_database_migration_unittest.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "base/stl_util.h" #include "base/string16.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" |