diff options
139 files changed, 141 insertions, 141 deletions
diff --git a/chrome/app/breakpad_win.cc b/chrome/app/breakpad_win.cc index 08d1891..c3eb88b 100644 --- a/chrome/app/breakpad_win.cc +++ b/chrome/app/breakpad_win.cc @@ -19,10 +19,10 @@ #include "base/file_util.h" #include "base/file_version_info.h" #include "base/memory/scoped_ptr.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/string16.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" #include "base/win/win_util.h" diff --git a/chrome/browser/autocomplete/contact_provider_chromeos.cc b/chrome/browser/autocomplete/contact_provider_chromeos.cc index 2d1c489..d715894 100644 --- a/chrome/browser/autocomplete/contact_provider_chromeos.cc +++ b/chrome/browser/autocomplete/contact_provider_chromeos.cc @@ -9,8 +9,8 @@ #include "base/i18n/break_iterator.h" #include "base/i18n/string_search.h" -#include "base/string_split.h" #include "base/string16.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_input.h" #include "chrome/browser/chromeos/contacts/contact.pb.h" diff --git a/chrome/browser/autofill/autocheckout/whitelist_manager.cc b/chrome/browser/autofill/autocheckout/whitelist_manager.cc index ceefec8..71d69ee 100644 --- a/chrome/browser/autofill/autocheckout/whitelist_manager.cc +++ b/chrome/browser/autofill/autocheckout/whitelist_manager.cc @@ -7,8 +7,8 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "chrome/common/chrome_switches.h" #include "content/public/browser/browser_context.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index c5c8824..f0e8b9c 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_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.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/credit_card.cc b/chrome/browser/autofill/credit_card.cc index abfd7ea..5dd3b7e 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_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_country.h" #include "chrome/browser/autofill/autofill_field.h" diff --git a/chrome/browser/autofill/risk/fingerprint.cc b/chrome/browser/autofill/risk/fingerprint.cc index 435afa9..09a608c 100644 --- a/chrome/browser/autofill/risk/fingerprint.cc +++ b/chrome/browser/autofill/risk/fingerprint.cc @@ -9,7 +9,7 @@ #include "base/cpu.h" #include "base/logging.h" #include "base/prefs/pref_service.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "base/sys_info.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/autofill/wallet/encryption_escrow_client.cc b/chrome/browser/autofill/wallet/encryption_escrow_client.cc index d1f79f2..43b17fa 100644 --- a/chrome/browser/autofill/wallet/encryption_escrow_client.cc +++ b/chrome/browser/autofill/wallet/encryption_escrow_client.cc @@ -7,8 +7,8 @@ #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_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/wallet/encryption_escrow_client_observer.h" #include "chrome/browser/autofill/wallet/instrument.h" diff --git a/chrome/browser/bookmarks/bookmark_index_unittest.cc b/chrome/browser/bookmarks/bookmark_index_unittest.cc index f9ae84e..fecf6e2 100644 --- a/chrome/browser/bookmarks/bookmark_index_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_index_unittest.cc @@ -8,9 +8,9 @@ #include <vector> #include "base/message_loop.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc index cc1939c..340e41f 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_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 5114b7d..8c6d160 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -29,8 +29,8 @@ #include "base/process_util.h" #include "base/run_loop.h" #include "base/string_piece.h" -#include "base/string_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/sys_info.h" #include "base/sys_string_conversions.h" #include "base/threading/platform_thread.h" diff --git a/chrome/browser/chromeos/camera_detector.cc b/chrome/browser/chromeos/camera_detector.cc index 34bf8c2..e7fddb9 100644 --- a/chrome/browser/chromeos/camera_detector.cc +++ b/chrome/browser/chromeos/camera_detector.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/file_util.h" #include "base/location.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/task_runner_util.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/storage_monitor/udev_util_linux.h" diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc index c768ca5..b8813f1 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc @@ -17,8 +17,8 @@ #include "base/linux_util.h" #include "base/message_loop.h" #include "base/prefs/pref_service.h" -#include "base/string_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.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/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc index 79581f0..9a06b59 100644 --- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc +++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc @@ -19,8 +19,8 @@ #include "base/logging.h" #include "base/memory/scoped_vector.h" #include "base/memory/singleton.h" -#include "base/string_split.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/chromeos/input_method/ibus_controller_impl.cc b/chrome/browser/chromeos/input_method/ibus_controller_impl.cc index 05ecb55..7210104 100644 --- a/chrome/browser/chromeos/input_method/ibus_controller_impl.cc +++ b/chrome/browser/chromeos/input_method/ibus_controller_impl.cc @@ -19,8 +19,8 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/rand_util.h" -#include "base/string_split.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "chrome/browser/chromeos/input_method/input_method_config.h" #include "chrome/browser/chromeos/input_method/input_method_property.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" diff --git a/chrome/browser/chromeos/input_method/input_method_descriptor.cc b/chrome/browser/chromeos/input_method/input_method_descriptor.cc index 5e68ed3..9d1c3fb 100644 --- a/chrome/browser/chromeos/input_method/input_method_descriptor.cc +++ b/chrome/browser/chromeos/input_method/input_method_descriptor.cc @@ -7,7 +7,7 @@ #include <sstream> #include "base/logging.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" namespace chromeos { namespace input_method { diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc index 6f772ef..e16900e 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.cc +++ b/chrome/browser/chromeos/input_method/input_method_util.cc @@ -12,8 +12,8 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/input_method/input_method_delegate.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/login/language_list.cc b/chrome/browser/chromeos/login/language_list.cc index e509a5e..50100f3 100644 --- a/chrome/browser/chromeos/login/language_list.cc +++ b/chrome/browser/chromeos/login/language_list.cc @@ -5,8 +5,8 @@ #include "chrome/browser/chromeos/login/language_list.h" #include "base/i18n/rtl.h" -#include "base/string_split.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index f75ef6d..688842f 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -11,8 +11,8 @@ #include "base/metrics/histogram.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/public/pref_member.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/accessibility/magnification_manager.h" diff --git a/chrome/browser/chromeos/system_logs/lsb_release_log_source.cc b/chrome/browser/chromeos/system_logs/lsb_release_log_source.cc index e8fb238..333fac2 100644 --- a/chrome/browser/chromeos/system_logs/lsb_release_log_source.cc +++ b/chrome/browser/chromeos/system_logs/lsb_release_log_source.cc @@ -11,8 +11,8 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/logging.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/version_loader.cc b/chrome/browser/chromeos/version_loader.cc index 56bee93..6d9c990 100644 --- a/chrome/browser/chromeos/version_loader.cc +++ b/chrome/browser/chromeos/version_loader.cc @@ -11,9 +11,9 @@ #include "base/files/file_path.h" #include "base/location.h" #include "base/message_loop.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "base/threading/sequenced_worker_pool.h" #include "base/threading/thread.h" #include "base/time.h" diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc index e2c56f8..71edeef 100644 --- a/chrome/browser/component_updater/pepper_flash_component_installer.cc +++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc @@ -16,9 +16,9 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/version.h" diff --git a/chrome/browser/content_settings/content_settings_utils.cc b/chrome/browser/content_settings/content_settings_utils.cc index 6534526..d3a2869 100644 --- a/chrome/browser/content_settings/content_settings_utils.cc +++ b/chrome/browser/content_settings/content_settings_utils.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "base/values.h" #include "chrome/browser/content_settings/content_settings_provider.h" #include "chrome/browser/content_settings/content_settings_rule.h" diff --git a/chrome/browser/crash_upload_list.cc b/chrome/browser/crash_upload_list.cc index 261b01c..b7b4972 100644 --- a/chrome/browser/crash_upload_list.cc +++ b/chrome/browser/crash_upload_list.cc @@ -11,8 +11,8 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/path_service.h" -#include "base/string_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #if defined(OS_WIN) #include "chrome/browser/crash_upload_list_win.h" #endif diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc index abd8dff..e777df1 100644 --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc @@ -12,8 +12,8 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/prefs/pref_service.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/download/chrome_download_manager_delegate.h" diff --git a/chrome/browser/download/download_query.cc b/chrome/browser/download/download_query.cc index fd380fc..e67be5e 100644 --- a/chrome/browser/download/download_query.cc +++ b/chrome/browser/download/download_query.cc @@ -17,8 +17,8 @@ #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" #include "base/string16.h" -#include "base/string_split.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index 8545f7d..117c93a 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -20,9 +20,9 @@ #include "base/metrics/histogram.h" #include "base/stl_util.h" #include "base/string16.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_danger_prompt.h" diff --git a/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc b/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc index dafa230..96da293 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc @@ -4,7 +4,7 @@ #include "base/file_util.h" #include "base/files/file_path.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/i18n/i18n_api.cc b/chrome/browser/extensions/api/i18n/i18n_api.cc index af33722..554c304 100644 --- a/chrome/browser/extensions/api/i18n/i18n_api.cc +++ b/chrome/browser/extensions/api/i18n/i18n_api.cc @@ -11,7 +11,7 @@ #include "base/lazy_instance.h" #include "base/prefs/pref_service.h" #include "base/string_piece.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/i18n.h" #include "chrome/common/extensions/api/i18n/default_locale_handler.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 9c2b154..74f40c5 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_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.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 ac2a992..48b07ee 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_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/extensions/api/record/record_api_test.cc b/chrome/browser/extensions/api/record/record_api_test.cc index 2700cc2..6827a6e 100644 --- a/chrome/browser/extensions/api/record/record_api_test.cc +++ b/chrome/browser/extensions/api/record/record_api_test.cc @@ -11,9 +11,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "base/threading/sequenced_worker_pool.h" #include "base/values.h" #include "chrome/browser/extensions/extension_function_test_utils.h" diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc index 47958b8..feadf5a 100644 --- a/chrome/browser/extensions/updater/extension_updater.cc +++ b/chrome/browser/extensions/updater/extension_updater.cc @@ -14,8 +14,8 @@ #include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/stl_util.h" -#include "base/string_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.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 098d2b3..756a492 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_split.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/threading/thread.h" #include "base/version.h" #include "chrome/browser/extensions/blacklist.h" diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc index c7b6f53..15e4a05 100644 --- a/chrome/browser/file_select_helper.cc +++ b/chrome/browser/file_select_helper.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/file_util.h" #include "base/platform_file.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index 766ac29..c9f0964 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -15,9 +15,9 @@ #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "base/process_util.h" -#include "base/string_split.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/google/google_util.cc b/chrome/browser/google/google_util.cc index f3d0575..a520822 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_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_url_tracker.h" diff --git a/chrome/browser/google_apis/fake_drive_service.cc b/chrome/browser/google_apis/fake_drive_service.cc index e6b6ce4..c289147 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_split.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/strings/string_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_unittest.cc b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc index 13c437a..42a8f8f 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_util.h" #include "base/files/file_path.h" #include "base/message_loop_proxy.h" -#include "base/string_split.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.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/test_server/http_request.cc b/chrome/browser/google_apis/test_server/http_request.cc index 157fb49..2feea9e 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_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" namespace google_apis { namespace test_server { diff --git a/chrome/browser/history/snippet.cc b/chrome/browser/history/snippet.cc index 511d170..929533d 100644 --- a/chrome/browser/history/snippet.cc +++ b/chrome/browser/history/snippet.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "third_party/icu/public/common/unicode/brkiter.h" #include "third_party/icu/public/common/unicode/utext.h" diff --git a/chrome/browser/history/snippet_unittest.cc b/chrome/browser/history/snippet_unittest.cc index ad174f1..0ac3ef6 100644 --- a/chrome/browser/history/snippet_unittest.cc +++ b/chrome/browser/history/snippet_unittest.cc @@ -6,8 +6,8 @@ #include <algorithm> -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/history/top_sites_database.cc b/chrome/browser/history/top_sites_database.cc index d200e76..5832392 100644 --- a/chrome/browser/history/top_sites_database.cc +++ b/chrome/browser/history/top_sites_database.cc @@ -4,8 +4,8 @@ #include "base/file_util.h" #include "base/memory/ref_counted.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "chrome/browser/diagnostics/sqlite_diagnostics.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/history/top_sites.h" diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc index 9813a28..9d70c53 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_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "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 2bbcb39..bc86d95 100644 --- a/chrome/browser/importer/firefox_importer_utils.cc +++ b/chrome/browser/importer/firefox_importer_utils.cc @@ -10,10 +10,10 @@ #include "base/file_util.h" #include "base/logging.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/search_engines/template_url.h" diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index 7a87ea9..bbec01e 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -18,8 +18,8 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/string16.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" diff --git a/chrome/browser/importer/nss_decryptor.cc b/chrome/browser/importer/nss_decryptor.cc index 7a00b35..2c19324 100644 --- a/chrome/browser/importer/nss_decryptor.cc +++ b/chrome/browser/importer/nss_decryptor.cc @@ -9,8 +9,8 @@ #include "base/base64.h" #include "base/memory/scoped_ptr.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "content/public/common/password_form.h" #include "sql/connection.h" diff --git a/chrome/browser/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc index fddb595..adaee0e 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_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.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/importer/toolbar_importer_utils.cc b/chrome/browser/importer/toolbar_importer_utils.cc index 69931c2..81f2854 100644 --- a/chrome/browser/importer/toolbar_importer_utils.cc +++ b/chrome/browser/importer/toolbar_importer_utils.cc @@ -8,7 +8,7 @@ #include <vector> #include "base/bind.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/internal_auth.cc b/chrome/browser/internal_auth.cc index c863cb0..d82fb07 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_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.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 178cbe7..2bbc475 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -15,9 +15,9 @@ #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/threading/thread.h" #include "base/threading/worker_pool.h" #include "build/build_config.h" diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc index 330d1b0..9d51014 100644 --- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc +++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc @@ -15,8 +15,8 @@ #include "base/memory/ref_counted.h" #include "base/sequenced_task_runner.h" #include "base/sequenced_task_runner_helpers.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/media_galleries/win/mtp_device_object_entry.h" diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc index 4d19340..5a95d45 100644 --- a/chrome/browser/metrics/thread_watcher.cc +++ b/chrome/browser/metrics/thread_watcher.cc @@ -10,9 +10,9 @@ #include "base/compiler_specific.h" #include "base/debug/alias.h" #include "base/lazy_instance.h" -#include "base/string_split.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.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 529358d..454dbc8 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_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/strings/string_tokenizer.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/metrics/variations/variations_registry_syncer_unittest_win.cc b/chrome/browser/metrics/variations/variations_registry_syncer_unittest_win.cc index 3f9ade0..1a1087d 100644 --- a/chrome/browser/metrics/variations/variations_registry_syncer_unittest_win.cc +++ b/chrome/browser/metrics/variations/variations_registry_syncer_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_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "chrome/browser/metrics/variations/variations_registry_syncer_win.h" #include "chrome/common/metrics/variations/variations_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/metrics/variations/variations_registry_syncer_win.cc b/chrome/browser/metrics/variations/variations_registry_syncer_win.cc index bb6bb8b..baca113 100644 --- a/chrome/browser/metrics/variations/variations_registry_syncer_win.cc +++ b/chrome/browser/metrics/variations/variations_registry_syncer_win.cc @@ -8,8 +8,8 @@ #include "base/metrics/field_trial.h" #include "base/path_service.h" #include "base/string_number_conversions.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/common/metrics/variations/variations_util.h" #include "chrome/installer/util/google_update_settings.h" diff --git a/chrome/browser/metrics/variations/variations_service_unittest.cc b/chrome/browser/metrics/variations/variations_service_unittest.cc index 4c5196a4..8888804 100644 --- a/chrome/browser/metrics/variations/variations_service_unittest.cc +++ b/chrome/browser/metrics/variations/variations_service_unittest.cc @@ -6,7 +6,7 @@ #include "base/base64.h" #include "base/prefs/testing_pref_service.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "chrome/browser/metrics/proto/study.pb.h" #include "chrome/browser/metrics/variations/resource_request_allowed_notifier_test_util.h" #include "chrome/browser/metrics/variations/variations_service.h" diff --git a/chrome/browser/nacl_host/nacl_browser.cc b/chrome/browser/nacl_host/nacl_browser.cc index 6d04f14..65594079 100644 --- a/chrome/browser/nacl_host/nacl_browser.cc +++ b/chrome/browser/nacl_host/nacl_browser.cc @@ -9,7 +9,7 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/pickle.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "base/win/windows_version.h" #include "build/build_config.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 3387299..c5df488 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_split.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "base/win/windows_version.h" #include "build/build_config.h" diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc index 93ff16a..896f97db 100644 --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc @@ -12,8 +12,8 @@ #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "base/prefs/public/pref_member.h" -#include "base/string_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.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/gaia/gaia_oauth_fetcher.cc b/chrome/browser/net/gaia/gaia_oauth_fetcher.cc index cf67ff8..d2b08f3 100644 --- a/chrome/browser/net/gaia/gaia_oauth_fetcher.cc +++ b/chrome/browser/net/gaia/gaia_oauth_fetcher.cc @@ -9,8 +9,8 @@ #include <vector> #include "base/json/json_reader.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/values.h" #include "chrome/browser/net/gaia/gaia_oauth_consumer.h" #include "google_apis/gaia/gaia_auth_fetcher.h" diff --git a/chrome/browser/net/http_pipelining_compatibility_client.cc b/chrome/browser/net/http_pipelining_compatibility_client.cc index ca6e5c9..359e6a7 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_split.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.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/predictor.cc b/chrome/browser/net/predictor.cc index fb77931..d0fac36 100644 --- a/chrome/browser/net/predictor.cc +++ b/chrome/browser/net/predictor.cc @@ -15,9 +15,9 @@ #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" diff --git a/chrome/browser/page_cycler/page_cycler.cc b/chrome/browser/page_cycler/page_cycler.cc index 13bdcd7..04086d2 100644 --- a/chrome/browser/page_cycler/page_cycler.cc +++ b/chrome/browser/page_cycler/page_cycler.cc @@ -9,8 +9,8 @@ #include "base/files/file_path.h" #include "base/message_loop.h" #include "base/process_util.h" -#include "base/string_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.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/page_cycler/page_cycler_browsertest.cc b/chrome/browser/page_cycler/page_cycler_browsertest.cc index 26096ac..a9d5d11 100644 --- a/chrome/browser/page_cycler/page_cycler_browsertest.cc +++ b/chrome/browser/page_cycler/page_cycler_browsertest.cc @@ -6,8 +6,8 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/path_service.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/page_cycler/page_cycler.h" diff --git a/chrome/browser/page_cycler/page_cycler_unittest.cc b/chrome/browser/page_cycler/page_cycler_unittest.cc index b06574e..5bdc135 100644 --- a/chrome/browser/page_cycler/page_cycler_unittest.cc +++ b/chrome/browser/page_cycler/page_cycler_unittest.cc @@ -5,8 +5,8 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/prefs/testing_pref_service.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/threading/sequenced_worker_pool.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/password_manager/password_form_manager.cc b/chrome/browser/password_manager/password_form_manager.cc index 4f1b910..92c7e33 100644 --- a/chrome/browser/password_manager/password_form_manager.cc +++ b/chrome/browser/password_manager/password_form_manager.cc @@ -7,8 +7,8 @@ #include <algorithm> #include "base/metrics/histogram.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/password_manager/password_store.h" #include "chrome/browser/password_manager/password_store_factory.h" diff --git a/chrome/browser/performance_monitor/key_builder.cc b/chrome/browser/performance_monitor/key_builder.cc index a2930d0..53b46cd 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_split.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" namespace performance_monitor { diff --git a/chrome/browser/policy/device_management_service_unittest.cc b/chrome/browser/policy/device_management_service_unittest.cc index 4a74cf3..23328ce 100644 --- a/chrome/browser/policy/device_management_service_unittest.cc +++ b/chrome/browser/policy/device_management_service_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "chrome/browser/policy/cloud_policy_constants.h" #include "chrome/browser/policy/device_management_service.h" #include "chrome/test/base/testing_browser_process.h" diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc index 8332927..8bf0b96 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_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/values.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index fecbda9..ccdb637 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_split.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/sys_string_conversions.h" #include "base/threading/platform_thread.h" #include "base/time.h" diff --git a/chrome/browser/profiles/profile_downloader.cc b/chrome/browser/profiles/profile_downloader.cc index 743bbaa..6464ecb 100644 --- a/chrome/browser/profiles/profile_downloader.cc +++ b/chrome/browser/profiles/profile_downloader.cc @@ -10,9 +10,9 @@ #include "base/json/json_reader.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_downloader_delegate.h" diff --git a/chrome/browser/safe_browsing/chunk_range.cc b/chrome/browser/safe_browsing/chunk_range.cc index dc1ff93..0bc4ca6 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_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" ChunkRange::ChunkRange(int start) : start_(start), stop_(start) { } diff --git a/chrome/browser/safe_browsing/protocol_parser.cc b/chrome/browser/safe_browsing/protocol_parser.cc index 7aac1d0..a647c6d 100644 --- a/chrome/browser/safe_browsing/protocol_parser.cc +++ b/chrome/browser/safe_browsing/protocol_parser.cc @@ -9,7 +9,7 @@ #include "base/format_macros.h" #include "base/logging.h" #include "base/stringprintf.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "base/sys_byteorder.h" #include "build/build_config.h" #include "chrome/browser/safe_browsing/protocol_parser.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc index 16745d6..6b425fa 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc @@ -15,7 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "base/test/thread_test_helper.h" #include "base/time.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index feb2b05..47a7f99 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_split.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.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/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc index 0f6369d..77b36c6 100644 --- a/chrome/browser/search_engines/template_url_service.cc +++ b/chrome/browser/search_engines/template_url_service.cc @@ -14,9 +14,9 @@ #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/google/google_url_tracker.h" diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc index 5a6b215..8c35473 100644 --- a/chrome/browser/search_engines/template_url_service_unittest.cc +++ b/chrome/browser/search_engines/template_url_service_unittest.cc @@ -7,8 +7,8 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/test/mock_time_provider.h" #include "base/threading/thread.h" #include "base/time.h" diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc index 92dc661..1f5a507 100644 --- a/chrome/browser/signin/signin_manager.cc +++ b/chrome/browser/signin/signin_manager.cc @@ -11,8 +11,8 @@ #include "base/command_line.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_service.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc index 18e1bae..47315ad 100644 --- a/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc +++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc @@ -9,8 +9,8 @@ #include "base/file_util.h" #include "base/files/important_file_writer.h" #include "base/md5.h" -#include "base/string_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/spellcheck_messages.h" diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc index eff9d5a..d9e9310 100644 --- a/chrome/browser/spellchecker/spellcheck_service.cc +++ b/chrome/browser/spellchecker/spellcheck_service.cc @@ -7,7 +7,7 @@ #include "base/platform_file.h" #include "base/prefs/pref_service.h" #include "base/prefs/public/pref_member.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/spellchecker/spellcheck_factory.h" diff --git a/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc b/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc index ba9b938..50707eb 100644 --- a/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc +++ b/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.cc @@ -6,8 +6,8 @@ #include "base/files/file_path.h" #include "base/stl_util.h" -#include "base/string_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/storage_monitor/media_storage_util.h" #include "chrome/browser/storage_monitor/removable_device_constants.h" diff --git a/chrome/browser/themes/theme_properties.cc b/chrome/browser/themes/theme_properties.cc index 1498d67..92be8fd 100644 --- a/chrome/browser/themes/theme_properties.cc +++ b/chrome/browser/themes/theme_properties.cc @@ -5,8 +5,8 @@ #include "chrome/browser/themes/theme_properties.h" #include "base/memory/scoped_ptr.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "chrome/browser/themes/browser_theme_pack.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index 855f045..1e87c8f 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -12,9 +12,9 @@ #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "base/values.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc index 393b03f..53d82da 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/prefs/pref_service.h" #include "base/string_number_conversions.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_country.h" diff --git a/chrome/browser/ui/search/search.cc b/chrome/browser/ui/search/search.cc index b83d97e..3594ebd 100644 --- a/chrome/browser/ui/search/search.cc +++ b/chrome/browser/ui/search/search.cc @@ -7,8 +7,8 @@ #include "base/command_line.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" -#include "base/string_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "chrome/browser/instant/instant_service.h" #include "chrome/browser/instant/instant_service_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index 56e5e90..e052cfc 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc @@ -19,8 +19,8 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" -#include "base/string_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.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 11b9c4f..14011cdd 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -20,8 +20,8 @@ #include "base/metrics/statistics_recorder.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" -#include "base/string_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.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/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc index 7a898ba..f0b8ced 100644 --- a/chrome/browser/ui/sync/one_click_signin_helper.cc +++ b/chrome/browser/ui/sync/one_click_signin_helper.cc @@ -16,8 +16,8 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/supports_user_data.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc index 0d53e43..de69382 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_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/tab_helper.h" diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index b7b7e24..cb7fdcb 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -81,7 +81,7 @@ #if defined(USE_ASH) #include "ash/wm/frame_painter.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #endif using base::Time; diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.cc b/chrome/browser/ui/webui/cookies_tree_model_util.cc index 640eed2..d03eebd 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_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.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 3ed911c..4e5c146 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_split.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/threading/thread.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc index b0d4609..53cd4cb 100644 --- a/chrome/browser/ui/webui/fileicon_source.cc +++ b/chrome/browser/ui/webui/fileicon_source.cc @@ -10,7 +10,7 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/common/time_format.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 e86d541..33a963a 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -22,9 +22,9 @@ #include "base/prefs/public/pref_member.h" #include "base/sequenced_task_runner_helpers.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/strings/string_split.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/favicon_webui_handler.cc b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc index 92f66b9..a614cb9 100644 --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc @@ -6,14 +6,14 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "base/values.h" -#include "chrome/browser/history/top_sites.h" #include "chrome/browser/extensions/extension_icon_manager.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" +#include "chrome/browser/history/top_sites.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc index 6c6bf36..92449e3 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/prefs/pref_service.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/net/chrome_url_request_context.h" diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc index 9143e0c..2b7caae 100644 --- a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc +++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc @@ -6,7 +6,7 @@ #include "base/memory/ref_counted_memory.h" #include "base/message_loop.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "chrome/browser/chromeos/login/default_user_images.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/common/url_constants.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 1ee292d..52cbe91 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_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/synchronization/lock.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/webdata/keyword_table.cc b/chrome/browser/webdata/keyword_table.cc index c1bb75e..53e15dd 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_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/history/history_database.h" diff --git a/chrome/common/child_process_logging_mac.mm b/chrome/common/child_process_logging_mac.mm index 39c05cd..af87dba 100644 --- a/chrome/common/child_process_logging_mac.mm +++ b/chrome/common/child_process_logging_mac.mm @@ -7,10 +7,10 @@ #import <Foundation/Foundation.h> #include "base/command_line.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_split.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/common/metrics/variations/variations_util.h" diff --git a/chrome/common/child_process_logging_posix.cc b/chrome/common/child_process_logging_posix.cc index 39544b0..1690cd5 100644 --- a/chrome/common/child_process_logging_posix.cc +++ b/chrome/common/child_process_logging_posix.cc @@ -6,9 +6,9 @@ #include "base/command_line.h" #include "base/format_macros.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/common/metrics/variations/variations_util.h" #include "chrome/installer/util/google_update_settings.h" diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc index 1c09e50..adcdf14 100644 --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc @@ -9,10 +9,10 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/process_util.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_split.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/common/child_process_logging.h" diff --git a/chrome/common/chrome_content_client_unittest.cc b/chrome/common/chrome_content_client_unittest.cc index 11c52ce..2d281cc 100644 --- a/chrome/common/chrome_content_client_unittest.cc +++ b/chrome/common/chrome_content_client_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/common/chrome_content_client.h" #include "base/command_line.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "content/public/common/content_switches.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/content_settings_pattern.cc b/chrome/common/content_settings_pattern.cc index 4420187..98ac6d6 100644 --- a/chrome/common/content_settings_pattern.cc +++ b/chrome/common/content_settings_pattern.cc @@ -7,8 +7,8 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "chrome/common/content_settings_pattern_parser.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc index 7515c1c..20021a3 100644 --- a/chrome/common/extensions/api/extension_api.cc +++ b/chrome/common/extensions/api/extension_api.cc @@ -12,9 +12,9 @@ #include "base/json/json_writer.h" #include "base/lazy_instance.h" #include "base/logging.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/values.h" #include "chrome/common/extensions/api/generated_schemas.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/common/extensions/command.cc b/chrome/common/extensions/command.cc index 531badf..c1fbd5c 100644 --- a/chrome/common/extensions/command.cc +++ b/chrome/common/extensions/command.cc @@ -5,9 +5,9 @@ #include "chrome/common/extensions/command.h" #include "base/logging.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/values.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_manifest_constants.h" diff --git a/chrome/common/extensions/csp_validator.cc b/chrome/common/extensions/csp_validator.cc index e6a7677..8f7805c 100644 --- a/chrome/common/extensions/csp_validator.cc +++ b/chrome/common/extensions/csp_validator.cc @@ -4,8 +4,8 @@ #include "chrome/common/extensions/csp_validator.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/strings/string_tokenizer.h" namespace extensions { diff --git a/chrome/common/extensions/manifest.cc b/chrome/common/extensions/manifest.cc index 982e4a9..512183e 100644 --- a/chrome/common/extensions/manifest.cc +++ b/chrome/common/extensions/manifest.cc @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/lazy_instance.h" #include "base/logging.h" -#include "base/string_split.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/features/base_feature_provider.h" diff --git a/chrome/common/extensions/permissions/socket_permission_data.cc b/chrome/common/extensions/permissions/socket_permission_data.cc index b45cf95..e44844c 100644 --- a/chrome/common/extensions/permissions/socket_permission_data.cc +++ b/chrome/common/extensions/permissions/socket_permission_data.cc @@ -10,9 +10,9 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "chrome/common/extensions/permissions/api_permission.h" #include "chrome/common/extensions/permissions/socket_permission.h" #include "googleurl/src/url_canon.h" diff --git a/chrome/common/extensions/permissions/usb_device_permission_data.cc b/chrome/common/extensions/permissions/usb_device_permission_data.cc index 2ca7248..e684f4c 100644 --- a/chrome/common/extensions/permissions/usb_device_permission_data.cc +++ b/chrome/common/extensions/permissions/usb_device_permission_data.cc @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/string_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/values.h" #include "chrome/common/extensions/permissions/api_permission.h" #include "chrome/common/extensions/permissions/usb_device_permission.h" diff --git a/chrome/common/web_apps.cc b/chrome/common/web_apps.cc index 4492de1..e2f726d 100644 --- a/chrome/common/web_apps.cc +++ b/chrome/common/web_apps.cc @@ -9,8 +9,8 @@ #include "base/json/json_reader.h" #include "base/string16.h" -#include "base/string_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/json_schema_validator.h" diff --git a/chrome/installer/util/compat_checks.cc b/chrome/installer/util/compat_checks.cc index 5393199..00ac052 100644 --- a/chrome/installer/util/compat_checks.cc +++ b/chrome/installer/util/compat_checks.cc @@ -4,9 +4,9 @@ #include "chrome/installer/util/compat_checks.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/win/registry.h" namespace { diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index 508ce8d..a01e4b02 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -20,10 +20,10 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/rand_util.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_split.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" #include "base/win/windows_version.h" diff --git a/chrome/installer/util/google_update_util.cc b/chrome/installer/util/google_update_util.cc index 5219ac8..f8704f0 100644 --- a/chrome/installer/util/google_update_util.cc +++ b/chrome/installer/util/google_update_util.cc @@ -16,7 +16,7 @@ #include "base/logging.h" #include "base/process_util.h" #include "base/string16.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "base/time.h" #include "base/win/registry.h" #include "base/win/scoped_handle.h" diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc index 0bc6353..b0f36f7 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -25,9 +25,9 @@ #include "base/memory/scoped_vector.h" #include "base/path_service.h" #include "base/string16.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/win/registry.h" diff --git a/chrome/renderer/autofill/autofill_agent.cc b/chrome/renderer/autofill/autofill_agent.cc index 422d6cc..099a68c 100644 --- a/chrome/renderer/autofill/autofill_agent.cc +++ b/chrome/renderer/autofill/autofill_agent.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/common/autofill/autocheckout_status.h" diff --git a/chrome/renderer/automation/automation_renderer_helper.cc b/chrome/renderer/automation/automation_renderer_helper.cc index adcaf1a..61a6586 100644 --- a/chrome/renderer/automation/automation_renderer_helper.cc +++ b/chrome/renderer/automation/automation_renderer_helper.cc @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/json/json_writer.h" #include "base/stringprintf.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/automation_events.h" diff --git a/chrome/renderer/extensions/chrome_v8_context.cc b/chrome/renderer/extensions/chrome_v8_context.cc index 7832e98..2abc772 100644 --- a/chrome/renderer/extensions/chrome_v8_context.cc +++ b/chrome/renderer/extensions/chrome_v8_context.cc @@ -6,7 +6,7 @@ #include "base/debug/trace_event.h" #include "base/logging.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "base/values.h" #include "chrome/common/extensions/api/extension_api.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/renderer/safe_browsing/phishing_url_feature_extractor.cc b/chrome/renderer/safe_browsing/phishing_url_feature_extractor.cc index 5233d86..4e438a9 100644 --- a/chrome/renderer/safe_browsing/phishing_url_feature_extractor.cc +++ b/chrome/renderer/safe_browsing/phishing_url_feature_extractor.cc @@ -9,10 +9,10 @@ #include <vector> #include "base/logging.h" -#include "base/perftimer.h" #include "base/metrics/histogram.h" -#include "base/string_split.h" +#include "base/perftimer.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "chrome/renderer/safe_browsing/features.h" #include "googleurl/src/gurl.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" diff --git a/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc b/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc index f8d316a..2056179 100644 --- a/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc +++ b/chrome/renderer/spellchecker/spellcheck_worditerator_unittest.cc @@ -7,7 +7,7 @@ #include "base/format_macros.h" #include "base/stringprintf.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/renderer/spellchecker/spellcheck_worditerator.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/service/cloud_print/cloud_print_connector.cc b/chrome/service/cloud_print/cloud_print_connector.cc index ce6373b..8792017 100644 --- a/chrome/service/cloud_print/cloud_print_connector.cc +++ b/chrome/service/cloud_print/cloud_print_connector.cc @@ -8,9 +8,9 @@ #include "base/bind_helpers.h" #include "base/md5.h" #include "base/rand_util.h" -#include "base/string_split.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/cloud_print/cloud_print_constants.h" diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc index 4d2c9f6..8a08b1d 100644 --- a/chrome/test/automation/proxy_launcher.cc +++ b/chrome/test/automation/proxy_launcher.cc @@ -8,9 +8,9 @@ #include "base/environment.h" #include "base/file_util.h" -#include "base/string_split.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/test/test_file_util.h" #include "base/test/test_timeouts.h" #include "base/utf_string_conversions.h" diff --git a/chrome/test/base/chrome_process_util_mac.cc b/chrome/test/base/chrome_process_util_mac.cc index bb387b2..2f502ff 100644 --- a/chrome/test/base/chrome_process_util_mac.cc +++ b/chrome/test/base/chrome_process_util_mac.cc @@ -9,10 +9,10 @@ #include "base/command_line.h" #include "base/process_util.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_split.h" MacChromeProcessInfoList GetRunningMacProcessInfo( const ChromeProcessList& process_list) { diff --git a/chrome/test/chromedriver/commands.cc b/chrome/test/chromedriver/commands.cc index 443cd1b..1be78b6 100644 --- a/chrome/test/chromedriver/commands.cc +++ b/chrome/test/chromedriver/commands.cc @@ -7,9 +7,9 @@ #include "base/callback.h" #include "base/environment.h" #include "base/file_util.h" -#include "base/string_split.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/sys_info.h" #include "base/values.h" #include "chrome/test/chromedriver/chrome.h" diff --git a/chrome/test/chromedriver/net/websocket.cc b/chrome/test/chromedriver/net/websocket.cc index 86c2b3a..166b832 100644 --- a/chrome/test/chromedriver/net/websocket.cc +++ b/chrome/test/chromedriver/net/websocket.cc @@ -8,8 +8,8 @@ #include "base/memory/scoped_vector.h" #include "base/rand_util.h" #include "base/sha1.h" -#include "base/string_split.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "net/base/io_buffer.h" #include "net/http/http_response_headers.h" #include "net/http/http_util.h" diff --git a/chrome/test/chromedriver/server/http_handler.cc b/chrome/test/chromedriver/server/http_handler.cc index f09275f..f2b0960 100644 --- a/chrome/test/chromedriver/server/http_handler.cc +++ b/chrome/test/chromedriver/server/http_handler.cc @@ -7,8 +7,8 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/values.h" #include "chrome/test/chromedriver/command_executor.h" #include "chrome/test/chromedriver/command_names.h" diff --git a/chrome/test/perf/dom_checker_uitest.cc b/chrome/test/perf/dom_checker_uitest.cc index f4db35a..f966250 100644 --- a/chrome/test/perf/dom_checker_uitest.cc +++ b/chrome/test/perf/dom_checker_uitest.cc @@ -8,8 +8,8 @@ #include "base/json/json_string_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/test/test_timeouts.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/test/perf/startup_test.cc b/chrome/test/perf/startup_test.cc index c190a34..d68b05c 100644 --- a/chrome/test/perf/startup_test.cc +++ b/chrome/test/perf/startup_test.cc @@ -5,10 +5,10 @@ #include "base/environment.h" #include "base/file_util.h" #include "base/path_service.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_split.h" #include "base/sys_info.h" #include "base/test/test_file_util.h" #include "base/test/test_timeouts.h" diff --git a/chrome/test/reliability/automated_ui_tests.cc b/chrome/test/reliability/automated_ui_tests.cc index 2c371c4..1cee9ae8 100644 --- a/chrome/test/reliability/automated_ui_tests.cc +++ b/chrome/test/reliability/automated_ui_tests.cc @@ -15,10 +15,10 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/rand_util.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_split.h" #include "base/threading/platform_thread.h" #include "base/time.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index c5010b0..cf59949 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -24,8 +24,8 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/string_split.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/test/test_file_util.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" diff --git a/chrome/test/webdriver/commands/cookie_commands.cc b/chrome/test/webdriver/commands/cookie_commands.cc index 8c5d8e1..afe44fcf 100644 --- a/chrome/test/webdriver/commands/cookie_commands.cc +++ b/chrome/test/webdriver/commands/cookie_commands.cc @@ -8,8 +8,8 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "base/string_split.h" #include "base/string_util.h" +#include "base/strings/string_split.h" #include "base/values.h" #include "chrome/test/webdriver/commands/response.h" #include "chrome/test/webdriver/webdriver_session.h" diff --git a/chrome/test/webdriver/commands/webelement_commands.cc b/chrome/test/webdriver/commands/webelement_commands.cc index e243638..e1245d8 100644 --- a/chrome/test/webdriver/commands/webelement_commands.cc +++ b/chrome/test/webdriver/commands/webelement_commands.cc @@ -7,9 +7,9 @@ #include "base/file_util.h" #include "base/format_macros.h" #include "base/memory/scoped_ptr.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/test/webdriver/commands/response.h" diff --git a/chrome/test/webdriver/frame_path.cc b/chrome/test/webdriver/frame_path.cc index 2335d0b..bce634d9 100644 --- a/chrome/test/webdriver/frame_path.cc +++ b/chrome/test/webdriver/frame_path.cc @@ -4,7 +4,7 @@ #include "chrome/test/webdriver/frame_path.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" namespace webdriver { diff --git a/chrome/test/webdriver/webdriver_automation.cc b/chrome/test/webdriver/webdriver_automation.cc index f604d78..b10ad79 100644 --- a/chrome/test/webdriver/webdriver_automation.cc +++ b/chrome/test/webdriver/webdriver_automation.cc @@ -17,9 +17,9 @@ #include "base/json/json_writer.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" -#include "base/string_split.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" #include "base/synchronization/waitable_event.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/test/webdriver/webdriver_dispatch.cc b/chrome/test/webdriver/webdriver_dispatch.cc index c80c86c..419f0fb 100644 --- a/chrome/test/webdriver/webdriver_dispatch.cc +++ b/chrome/test/webdriver/webdriver_dispatch.cc @@ -14,9 +14,9 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop_proxy.h" -#include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/strings/string_split.h" #include "base/synchronization/waitable_event.h" #include "base/sys_info.h" #include "base/threading/platform_thread.h" diff --git a/chrome/test/webdriver/webdriver_server.cc b/chrome/test/webdriver/webdriver_server.cc index cc4339f..427e8ba 100644 --- a/chrome/test/webdriver/webdriver_server.cc +++ b/chrome/test/webdriver/webdriver_server.cc @@ -19,10 +19,10 @@ #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.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_split.h" #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" diff --git a/chrome/test/webdriver/webdriver_session.cc b/chrome/test/webdriver/webdriver_session.cc index 9d50dde..953120a 100644 --- a/chrome/test/webdriver/webdriver_session.cc +++ b/chrome/test/webdriver/webdriver_session.cc @@ -18,10 +18,10 @@ #include "base/message_loop_proxy.h" #include "base/process.h" #include "base/process_util.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_split.h" #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" diff --git a/chrome/test/webdriver/webdriver_util.cc b/chrome/test/webdriver/webdriver_util.cc index 831bab4..b17abb2 100644 --- a/chrome/test/webdriver/webdriver_util.cc +++ b/chrome/test/webdriver/webdriver_util.cc @@ -13,10 +13,10 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" #include "base/rand_util.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_split.h" #include "base/third_party/icu/icu_utf.h" #include "chrome/common/automation_id.h" #include "chrome/common/zip.h" diff --git a/chrome/tools/convert_dict/aff_reader.cc b/chrome/tools/convert_dict/aff_reader.cc index 6b419ab..39eede0 100644 --- a/chrome/tools/convert_dict/aff_reader.cc +++ b/chrome/tools/convert_dict/aff_reader.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/i18n/icu_string_conversions.h" #include "base/stringprintf.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/tools/convert_dict/hunspell_reader.h" |