diff options
92 files changed, 107 insertions, 107 deletions
diff --git a/chrome/browser/renderer_host/offline_resource_throttle.cc b/chrome/browser/renderer_host/offline_resource_throttle.cc index ac8b722..ceaffca 100644 --- a/chrome/browser/renderer_host/offline_resource_throttle.cc +++ b/chrome/browser/renderer_host/offline_resource_throttle.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/memory/singleton.h" #include "base/metrics/histogram.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "chrome/browser/chromeos/offline/offline_load_page.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/renderer_host/pepper/pepper_extensions_common_message_filter.h b/chrome/browser/renderer_host/pepper/pepper_extensions_common_message_filter.h index d4bfca8..d9dae5c 100644 --- a/chrome/browser/renderer_host/pepper/pepper_extensions_common_message_filter.h +++ b/chrome/browser/renderer_host/pepper/pepper_extensions_common_message_filter.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/extensions/extension_function.h" #include "googleurl/src/gurl.h" #include "ppapi/c/pp_instance.h" diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc index 6428cec..968a33c 100644 --- a/chrome/browser/rlz/rlz.cc +++ b/chrome/browser/rlz/rlz.cc @@ -15,7 +15,7 @@ #include "base/debug/trace_event.h" #include "base/message_loop.h" #include "base/prefs/pref_service.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_util.h" diff --git a/chrome/browser/rlz/rlz.h b/chrome/browser/rlz/rlz.h index 53484e1..e4a361c 100644 --- a/chrome/browser/rlz/rlz.h +++ b/chrome/browser/rlz/rlz.h @@ -14,7 +14,7 @@ #include "base/basictypes.h" #include "base/memory/singleton.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/rlz/rlz_unittest.cc b/chrome/browser/rlz/rlz_unittest.cc index 2d0ec3e..9bdf98b 100644 --- a/chrome/browser/rlz/rlz_unittest.cc +++ b/chrome/browser/rlz/rlz_unittest.cc @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" #include "chrome/browser/google/google_util.h" diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.cc b/chrome/browser/safe_browsing/browser_feature_extractor.cc index 00cc9d1..1ebf378 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor.cc @@ -11,7 +11,7 @@ #include "base/bind_helpers.h" #include "base/format_macros.h" #include "base/stl_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/time.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/history/history_service.h" diff --git a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc index 66fabfa..e52cbfd 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/time.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_service.h" diff --git a/chrome/browser/safe_browsing/chunk_range.cc b/chrome/browser/safe_browsing/chunk_range.cc index 0bc4ca6..6e5c3f8 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_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" ChunkRange::ChunkRange(int start) : start_(start), stop_(start) { } diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc index 5bbae8b..9c2aeed 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc @@ -6,7 +6,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/safe_browsing/browser_feature_extractor.h" #include "chrome/browser/safe_browsing/client_side_detection_host.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc index 7ec973d..87503a6 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc @@ -12,7 +12,7 @@ #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/safe_browsing/database_manager.cc b/chrome/browser/safe_browsing/database_manager.cc index 278dbac..5832550 100644 --- a/chrome/browser/safe_browsing/database_manager.cc +++ b/chrome/browser/safe_browsing/database_manager.cc @@ -13,7 +13,7 @@ #include "base/debug/leak_tracker.h" #include "base/path_service.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc index 2700f57..901d5e9 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_util.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.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/malware_details_cache.cc b/chrome/browser/safe_browsing/malware_details_cache.cc index f275ce6..5c4ec37 100644 --- a/chrome/browser/safe_browsing/malware_details_cache.cc +++ b/chrome/browser/safe_browsing/malware_details_cache.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/lazy_instance.h" #include "base/md5.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/safe_browsing/malware_details_cache.h" #include "chrome/browser/safe_browsing/report.pb.h" diff --git a/chrome/browser/safe_browsing/ping_manager.cc b/chrome/browser/safe_browsing/ping_manager.cc index baa8db2..1613fa6 100644 --- a/chrome/browser/safe_browsing/ping_manager.cc +++ b/chrome/browser/safe_browsing/ping_manager.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/stl_util.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "chrome/common/env_vars.h" #include "content/public/browser/browser_thread.h" #include "google_apis/google_api_keys.h" diff --git a/chrome/browser/safe_browsing/ping_manager_unittest.cc b/chrome/browser/safe_browsing/ping_manager_unittest.cc index fd8c888..8673c24 100644 --- a/chrome/browser/safe_browsing/ping_manager_unittest.cc +++ b/chrome/browser/safe_browsing/ping_manager_unittest.cc @@ -4,12 +4,12 @@ // #include "base/logging.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/time.h" -#include "testing/gtest/include/gtest/gtest.h" #include "chrome/browser/safe_browsing/ping_manager.h" #include "google_apis/google_api_keys.h" #include "net/base/escape.h" +#include "testing/gtest/include/gtest/gtest.h" using base::Time; using base::TimeDelta; diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc index 1f39a95..ff8856c 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc @@ -12,8 +12,8 @@ #include "base/metrics/histogram.h" #include "base/rand_util.h" #include "base/stl_util.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/timer.h" #include "chrome/browser/safe_browsing/protocol_parser.h" #include "chrome/common/chrome_version_info.h" diff --git a/chrome/browser/safe_browsing/protocol_manager_helper.cc b/chrome/browser/safe_browsing/protocol_manager_helper.cc index f7dd5bc..f69e6f8 100644 --- a/chrome/browser/safe_browsing/protocol_manager_helper.cc +++ b/chrome/browser/safe_browsing/protocol_manager_helper.cc @@ -10,8 +10,8 @@ #include "base/environment.h" #include "base/logging.h" #include "base/stl_util.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/env_vars.h" #include "google_apis/google_api_keys.h" diff --git a/chrome/browser/safe_browsing/protocol_manager_unittest.cc b/chrome/browser/safe_browsing/protocol_manager_unittest.cc index 99ab5d2..06af5ad 100644 --- a/chrome/browser/safe_browsing/protocol_manager_unittest.cc +++ b/chrome/browser/safe_browsing/protocol_manager_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. // -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/test/test_simple_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/time.h" diff --git a/chrome/browser/safe_browsing/protocol_parser.cc b/chrome/browser/safe_browsing/protocol_parser.cc index 74afdfe..25de0c1 100644 --- a/chrome/browser/safe_browsing/protocol_parser.cc +++ b/chrome/browser/safe_browsing/protocol_parser.cc @@ -8,8 +8,8 @@ #include "base/format_macros.h" #include "base/logging.h" -#include "base/stringprintf.h" #include "base/strings/string_split.h" +#include "base/strings/stringprintf.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/protocol_parser_unittest.cc b/chrome/browser/safe_browsing/protocol_parser_unittest.cc index ca53694..415d4b5 100644 --- a/chrome/browser/safe_browsing/protocol_parser_unittest.cc +++ b/chrome/browser/safe_browsing/protocol_parser_unittest.cc @@ -4,7 +4,7 @@ // // Program to test the SafeBrowsing protocol parsing v2.1. -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "chrome/browser/safe_browsing/protocol_parser.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index cef5df0..e724f31 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -14,9 +14,9 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" #include "base/values.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index e02ae21..d522b47 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -14,7 +14,7 @@ #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.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 d3831fe..b33bc2e 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/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/test/test_timeouts.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_util.cc b/chrome/browser/safe_browsing/safe_browsing_util.cc index 724b6e6..c979f2f 100644 --- a/chrome/browser/safe_browsing/safe_browsing_util.cc +++ b/chrome/browser/safe_browsing/safe_browsing_util.cc @@ -5,8 +5,8 @@ #include "chrome/browser/safe_browsing/safe_browsing_util.h" #include "base/logging.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "chrome/browser/google/google_util.h" #include "crypto/sha2.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_util_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_util_unittest.cc index b172508..d43c20e 100644 --- a/chrome/browser/safe_browsing/safe_browsing_util_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_util_unittest.cc @@ -4,9 +4,9 @@ #include <algorithm> -#include "base/stringprintf.h" -#include "crypto/sha2.h" +#include "base/strings/stringprintf.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" +#include "crypto/sha2.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/safe_browsing/ui_manager.cc b/chrome/browser/safe_browsing/ui_manager.cc index 6b830af..3b3ba70 100644 --- a/chrome/browser/safe_browsing/ui_manager.cc +++ b/chrome/browser/safe_browsing/ui_manager.cc @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/debug/leak_tracker.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/search/iframe_source.cc b/chrome/browser/search/iframe_source.cc index d3fbb42..d204ee7 100644 --- a/chrome/browser/search/iframe_source.cc +++ b/chrome/browser/search/iframe_source.cc @@ -6,8 +6,8 @@ #include "base/json/string_escape.h" #include "base/memory/ref_counted_memory.h" -#include "base/string_util.h" #include "base/strings/string_piece.h" +#include "base/strings/string_util.h" #include "chrome/browser/search/instant_io_context.h" #include "chrome/common/url_constants.h" #include "content/public/browser/render_view_host.h" diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/local_ntp_source.cc index 9622653..6c92cbe 100644 --- a/chrome/browser/search/local_ntp_source.cc +++ b/chrome/browser/search/local_ntp_source.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/memory/ref_counted_memory.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/values.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/search/search.h b/chrome/browser/search/search.h index 59399de..3069b0e 100644 --- a/chrome/browser/search/search.h +++ b/chrome/browser/search/search.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/common/instant_types.h" class GURL; diff --git a/chrome/browser/search_engines/search_terms_data.h b/chrome/browser/search_engines/search_terms_data.h index e11975e..2a13fc4 100644 --- a/chrome/browser/search_engines/search_terms_data.h +++ b/chrome/browser/search_engines/search_terms_data.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/string16.h" +#include "base/strings/string16.h" class Profile; diff --git a/chrome/browser/search_engines/search_terms_data_android.h b/chrome/browser/search_engines/search_terms_data_android.h index 06bb106..a104780 100644 --- a/chrome/browser/search_engines/search_terms_data_android.h +++ b/chrome/browser/search_engines/search_terms_data_android.h @@ -8,7 +8,7 @@ #include <string> #include "base/lazy_instance.h" -#include "base/string16.h" +#include "base/strings/string16.h" // Additional data needed by TemplateURLRef::ReplaceSearchTerms on Android. struct SearchTermsDataAndroid { diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc index 7ac444a..686429c 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_util.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/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.h b/chrome/browser/search_engines/template_url_fetcher.h index 4b43aab..2bd08a4 100644 --- a/chrome/browser/search_engines/template_url_fetcher.h +++ b/chrome/browser/search_engines/template_url_fetcher.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_FETCHER_H_ #include "base/memory/scoped_vector.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/search_engines/template_url_parser.cc b/chrome/browser/search_engines/template_url_parser.cc index 4f299ea..121e539 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_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/search_engines/search_terms_data.h" #include "chrome/browser/search_engines/template_url.h" diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc index 3a144df8..07438a9 100644 --- a/chrome/browser/search_engines/template_url_prepopulate_data.cc +++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc @@ -13,9 +13,9 @@ #include "base/memory/scoped_vector.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" -#include "base/string16.h" -#include "base/string_util.h" +#include "base/strings/string16.h" #include "base/strings/string_piece.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.h b/chrome/browser/search_engines/template_url_prepopulate_data.h index 3d1fa43..7eebf8d 100644 --- a/chrome/browser/search_engines/template_url_prepopulate_data.h +++ b/chrome/browser/search_engines/template_url_prepopulate_data.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/search_engines/search_engine_type.h" class GURL; diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc index 2cf305e..bf67095 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_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" #include "chrome/browser/google/google_url_tracker.h" diff --git a/chrome/browser/search_engines/template_url_service_android.cc b/chrome/browser/search_engines/template_url_service_android.cc index 04d573d..6229549 100644 --- a/chrome/browser/search_engines/template_url_service_android.cc +++ b/chrome/browser/search_engines/template_url_service_android.cc @@ -6,7 +6,7 @@ #include "base/android/jni_string.h" #include "base/format_macros.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc index df0ac08..72fc3a0 100644 --- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc +++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc @@ -4,7 +4,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" #include "chrome/browser/search_engines/search_terms_data.h" diff --git a/chrome/browser/search_engines/template_url_service_test_util.h b/chrome/browser/search_engines/template_url_service_test_util.h index 3b546e1..42114d4 100644 --- a/chrome/browser/search_engines/template_url_service_test_util.h +++ b/chrome/browser/search_engines/template_url_service_test_util.h @@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/search_engines/template_url_service_observer.h" #include "chrome/test/base/testing_browser_process.h" #include "content/public/test/test_browser_thread.h" diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc index ddb09b0..68e845f 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_util.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/test/mock_time_provider.h" #include "base/threading/thread.h" diff --git a/chrome/browser/search_engines/template_url_service_util_unittest.cc b/chrome/browser/search_engines/template_url_service_util_unittest.cc index d923a4b..163b6de 100644 --- a/chrome/browser/search_engines/template_url_service_util_unittest.cc +++ b/chrome/browser/search_engines/template_url_service_util_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/memory/scoped_vector.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/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_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc index 2ef3b9f..cffbb59 100644 --- a/chrome/browser/search_engines/template_url_unittest.cc +++ b/chrome/browser/search_engines/template_url_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/base_paths.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/rlz/rlz.h" diff --git a/chrome/browser/search_engines/util.h b/chrome/browser/search_engines/util.h index 158841a..912748d 100644 --- a/chrome/browser/search_engines/util.h +++ b/chrome/browser/search_engines/util.h @@ -11,7 +11,7 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/search_engines/template_url_service.h" class Profile; diff --git a/chrome/browser/sessions/persistent_tab_restore_service_browsertest.cc b/chrome/browser/sessions/persistent_tab_restore_service_browsertest.cc index f73ce61..68491431 100644 --- a/chrome/browser/sessions/persistent_tab_restore_service_browsertest.cc +++ b/chrome/browser/sessions/persistent_tab_restore_service_browsertest.cc @@ -6,7 +6,7 @@ #include "base/compiler_specific.h" #include "base/run_loop.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_service.h" diff --git a/chrome/browser/sessions/session_backend_unittest.cc b/chrome/browser/sessions/session_backend_unittest.cc index a24cc33..9be1808 100644 --- a/chrome/browser/sessions/session_backend_unittest.cc +++ b/chrome/browser/sessions/session_backend_unittest.cc @@ -5,7 +5,7 @@ #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "chrome/browser/sessions/session_backend.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index 44331cf..e9d9e2a 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -18,7 +18,7 @@ #include "base/metrics/histogram.h" #include "base/platform_file.h" #include "base/stl_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/performance_monitor/startup_timer.h" diff --git a/chrome/browser/sessions/session_types.h b/chrome/browser/sessions/session_types.h index d97fe28..c83c104 100644 --- a/chrome/browser/sessions/session_types.h +++ b/chrome/browser/sessions/session_types.h @@ -10,7 +10,7 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/time.h" #include "chrome/browser/sessions/session_id.h" #include "components/sessions/serialized_navigation_entry.h" diff --git a/chrome/browser/sessions/session_types_unittest.cc b/chrome/browser/sessions/session_types_unittest.cc index 5649b84..90ae78d 100644 --- a/chrome/browser/sessions/session_types_unittest.cc +++ b/chrome/browser/sessions/session_types_unittest.cc @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/pickle.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc index b09bf1f..4551315 100644 --- a/chrome/browser/shell_integration.cc +++ b/chrome/browser/shell_integration.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/policy/policy_path_parser.h" diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h index f781b00..09a7945 100644 --- a/chrome/browser/shell_integration.h +++ b/chrome/browser/shell_integration.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/files/file_path.h" #include "base/memory/ref_counted.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "googleurl/src/gurl.h" #include "ui/gfx/image/image_family.h" diff --git a/chrome/browser/shell_integration_unittest.cc b/chrome/browser/shell_integration_unittest.cc index 2025e5f..141daee 100644 --- a/chrome/browser/shell_integration_unittest.cc +++ b/chrome/browser/shell_integration_unittest.cc @@ -13,7 +13,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_path_override.h" #include "chrome/browser/web_applications/web_app.h" diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc index 79cf9a5..8184442 100644 --- a/chrome/browser/shell_integration_win.cc +++ b/chrome/browser/shell_integration_win.cc @@ -14,9 +14,9 @@ #include "base/files/file_enumerator.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/string_util.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/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 bbaa892..fa91c1c 100644 --- a/chrome/browser/shell_integration_win_unittest.cc +++ b/chrome/browser/shell_integration_win_unittest.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/test/test_shortcut_win.h" diff --git a/chrome/browser/signin/oauth2_token_service_test_util.h b/chrome/browser/signin/oauth2_token_service_test_util.h index f99fab3..6f670aa 100644 --- a/chrome/browser/signin/oauth2_token_service_test_util.h +++ b/chrome/browser/signin/oauth2_token_service_test_util.h @@ -9,7 +9,7 @@ #include <string> -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "google_apis/gaia/google_service_auth_error.h" extern const char kValidTokenResponse[]; diff --git a/chrome/browser/signin/oauth2_token_service_unittest.cc b/chrome/browser/signin/oauth2_token_service_unittest.cc index 8e43a60..e9e9fca 100644 --- a/chrome/browser/signin/oauth2_token_service_unittest.cc +++ b/chrome/browser/signin/oauth2_token_service_unittest.cc @@ -4,7 +4,7 @@ #include <string> -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "chrome/browser/signin/oauth2_token_service.h" #include "chrome/browser/signin/oauth2_token_service_test_util.h" #include "chrome/browser/signin/token_service_factory.h" diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc index 89d51b7..68479d4 100644 --- a/chrome/browser/signin/signin_manager.cc +++ b/chrome/browser/signin/signin_manager.cc @@ -10,8 +10,8 @@ #include "base/command_line.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_service.h" -#include "base/string_util.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" #include "chrome/browser/profiles/profile_io_data.h" diff --git a/chrome/browser/signin/signin_manager_base.cc b/chrome/browser/signin/signin_manager_base.cc index 97910d9..b9d2071 100644 --- a/chrome/browser/signin/signin_manager_base.cc +++ b/chrome/browser/signin/signin_manager_base.cc @@ -10,8 +10,8 @@ #include "base/command_line.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_service.h" -#include "base/string_util.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/signin/about_signin_internals.h" #include "chrome/browser/signin/about_signin_internals_factory.h" diff --git a/chrome/browser/signin/signin_manager_unittest.cc b/chrome/browser/signin/signin_manager_unittest.cc index 83a360d..0c5b796 100644 --- a/chrome/browser/signin/signin_manager_unittest.cc +++ b/chrome/browser/signin/signin_manager_unittest.cc @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/prefs/pref_service.h" #include "base/prefs/testing_pref_service.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/signin/chrome_signin_manager_delegate.h" diff --git a/chrome/browser/signin/signin_names_io_thread.h b/chrome/browser/signin/signin_names_io_thread.h index c0072ac..4e4b9e9 100644 --- a/chrome/browser/signin/signin_names_io_thread.h +++ b/chrome/browser/signin/signin_names_io_thread.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/signin/signin_ui_util.h b/chrome/browser/signin/signin_ui_util.h index 821fd0e..decae32 100644 --- a/chrome/browser/signin/signin_ui_util.h +++ b/chrome/browser/signin/signin_ui_util.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SIGNIN_SIGNIN_UI_UTIL_H_ #define CHROME_BROWSER_SIGNIN_SIGNIN_UI_UTIL_H_ -#include "base/string16.h" +#include "base/strings/string16.h" class GlobalError; class Profile; diff --git a/chrome/browser/signin/token_service.cc b/chrome/browser/signin/token_service.cc index 33ef342..2237ada 100644 --- a/chrome/browser/signin/token_service.cc +++ b/chrome/browser/signin/token_service.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/prefs/pref_service.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" diff --git a/chrome/browser/signin/ubertoken_fetcher.cc b/chrome/browser/signin/ubertoken_fetcher.cc index 43bf816..b722f12 100644 --- a/chrome/browser/signin/ubertoken_fetcher.cc +++ b/chrome/browser/signin/ubertoken_fetcher.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/token_service.h" #include "chrome/browser/signin/token_service_factory.h" diff --git a/chrome/browser/speech/speech_recognition_bubble.h b/chrome/browser/speech/speech_recognition_bubble.h index 11b05a3..2bb911f 100644 --- a/chrome/browser/speech/speech_recognition_bubble.h +++ b/chrome/browser/speech/speech_recognition_bubble.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "ui/base/layout.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/spellchecker/feedback_sender_unittest.cc b/chrome/browser/spellchecker/feedback_sender_unittest.cc index 141f848..262b009 100644 --- a/chrome/browser/spellchecker/feedback_sender_unittest.cc +++ b/chrome/browser/spellchecker/feedback_sender_unittest.cc @@ -10,7 +10,7 @@ #include "base/json/json_reader.h" #include "base/message_loop.h" #include "base/metrics/field_trial.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/spellchecker/feedback_sender.h" diff --git a/chrome/browser/spellchecker/spellcheck_action.h b/chrome/browser/spellchecker/spellcheck_action.h index c1b3cd2..d8471d9 100644 --- a/chrome/browser/spellchecker/spellcheck_action.h +++ b/chrome/browser/spellchecker/spellcheck_action.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_ACTION_H_ #define CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_ACTION_H_ -#include "base/string16.h" +#include "base/strings/string16.h" namespace base { class DictionaryValue; diff --git a/chrome/browser/spellchecker/spellcheck_platform_mac.h b/chrome/browser/spellchecker/spellcheck_platform_mac.h index deb4ed2..fe5419d 100644 --- a/chrome/browser/spellchecker/spellcheck_platform_mac.h +++ b/chrome/browser/spellchecker/spellcheck_platform_mac.h @@ -12,7 +12,7 @@ #include <vector> #include "base/callback_forward.h" -#include "base/string16.h" +#include "base/strings/string16.h" struct SpellCheckResult; diff --git a/chrome/browser/spellchecker/spellcheck_platform_mac_unittest.cc b/chrome/browser/spellchecker/spellcheck_platform_mac_unittest.cc index fab2014..5f9084c 100644 --- a/chrome/browser/spellchecker/spellcheck_platform_mac_unittest.cc +++ b/chrome/browser/spellchecker/spellcheck_platform_mac_unittest.cc @@ -4,7 +4,7 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/spellchecker/spellcheck_platform_mac.h" #include "chrome/common/spellcheck_result.h" diff --git a/chrome/browser/spellchecker/spelling_service_client.cc b/chrome/browser/spellchecker/spelling_service_client.cc index 5fdee79..b3cad80 100644 --- a/chrome/browser/spellchecker/spelling_service_client.cc +++ b/chrome/browser/spellchecker/spelling_service_client.cc @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/spellchecker/spelling_service_client.h b/chrome/browser/spellchecker/spelling_service_client.h index 08ae2e9..6edeae9 100644 --- a/chrome/browser/spellchecker/spelling_service_client.h +++ b/chrome/browser/spellchecker/spelling_service_client.h @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "net/url_request/url_fetcher_delegate.h" class GURL; diff --git a/chrome/browser/spellchecker/spelling_service_client_unittest.cc b/chrome/browser/spellchecker/spelling_service_client_unittest.cc index e4d5ad7..c40bc55 100644 --- a/chrome/browser/spellchecker/spelling_service_client_unittest.cc +++ b/chrome/browser/spellchecker/spelling_service_client_unittest.cc @@ -9,7 +9,7 @@ #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/spellchecker/spelling_service_client.h" diff --git a/chrome/browser/spellchecker/word_trimmer.h b/chrome/browser/spellchecker/word_trimmer.h index 962ea84..ef2c836 100644 --- a/chrome/browser/spellchecker/word_trimmer.h +++ b/chrome/browser/spellchecker/word_trimmer.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SPELLCHECKER_WORD_TRIMMER_H_ #define CHROME_BROWSER_SPELLCHECKER_WORD_TRIMMER_H_ -#include "base/string16.h" +#include "base/strings/string16.h" // Trims |text| to contain only the range from |start| to |end| and |keep| words // on either side of the range. The |start| and |end| parameters are character diff --git a/chrome/browser/ssl/ssl_blocking_page.h b/chrome/browser/ssl/ssl_blocking_page.h index 3a18b9c..bf22613 100644 --- a/chrome/browser/ssl/ssl_blocking_page.h +++ b/chrome/browser/ssl/ssl_blocking_page.h @@ -9,7 +9,7 @@ #include <vector> #include "base/callback.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/time.h" #include "content/public/browser/interstitial_page_delegate.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 68a5ffb..8399a03 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -5,8 +5,8 @@ #include "base/command_line.h" #include "base/path_service.h" #include "base/prefs/pref_service.h" -#include "base/string_util.h" -#include "base/stringprintf.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/ssl/ssl_error_info.h b/chrome/browser/ssl/ssl_error_info.h index f03463c..5e29523 100644 --- a/chrome/browser/ssl/ssl_error_info.h +++ b/chrome/browser/ssl/ssl_error_info.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/string16.h" +#include "base/strings/string16.h" #include "net/cert/cert_status_flags.h" #include "net/cert/x509_certificate.h" diff --git a/chrome/browser/status_icons/desktop_notification_balloon.h b/chrome/browser/status_icons/desktop_notification_balloon.h index 7ce9712..89dc99b 100644 --- a/chrome/browser/status_icons/desktop_notification_balloon.h +++ b/chrome/browser/status_icons/desktop_notification_balloon.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" class Notification; diff --git a/chrome/browser/status_icons/status_icon.h b/chrome/browser/status_icons/status_icon.h index 9cd02d7..0303946 100644 --- a/chrome/browser/status_icons/status_icon.h +++ b/chrome/browser/status_icons/status_icon.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/string16.h" +#include "base/strings/string16.h" namespace gfx { class ImageSkia; diff --git a/chrome/browser/status_icons/status_tray_unittest.cc b/chrome/browser/status_icons/status_tray_unittest.cc index 16e2746..818a4fa 100644 --- a/chrome/browser/status_icons/status_tray_unittest.cc +++ b/chrome/browser/status_icons/status_tray_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/compiler_specific.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/status_icons/status_icon.h" #include "chrome/browser/status_icons/status_tray.h" diff --git a/chrome/browser/storage_monitor/image_capture_device.h b/chrome/browser/storage_monitor/image_capture_device.h index 71d5736..0860d9d 100644 --- a/chrome/browser/storage_monitor/image_capture_device.h +++ b/chrome/browser/storage_monitor/image_capture_device.h @@ -15,7 +15,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/memory/weak_ptr.h" #include "base/platform_file.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/synchronization/lock.h" diff --git a/chrome/browser/storage_monitor/media_storage_util.cc b/chrome/browser/storage_monitor/media_storage_util.cc index 5661ea3..aabee8c 100644 --- a/chrome/browser/storage_monitor/media_storage_util.cc +++ b/chrome/browser/storage_monitor/media_storage_util.cc @@ -10,7 +10,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/storage_monitor/removable_device_constants.h" #include "chrome/browser/storage_monitor/storage_monitor.h" diff --git a/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h b/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h index d67cab2..73dfd48 100644 --- a/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h +++ b/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h @@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/storage_monitor/storage_monitor.h" #include "device/media_transfer_protocol/media_transfer_protocol_manager.h" diff --git a/chrome/browser/storage_monitor/portable_device_watcher_win.cc b/chrome/browser/storage_monitor/portable_device_watcher_win.cc index f122be9..2a2b9da 100644 --- a/chrome/browser/storage_monitor/portable_device_watcher_win.cc +++ b/chrome/browser/storage_monitor/portable_device_watcher_win.cc @@ -14,7 +14,7 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "base/win/scoped_co_mem.h" diff --git a/chrome/browser/storage_monitor/portable_device_watcher_win.h b/chrome/browser/storage_monitor/portable_device_watcher_win.h index 0768d0e..44cd80ecd 100644 --- a/chrome/browser/storage_monitor/portable_device_watcher_win.h +++ b/chrome/browser/storage_monitor/portable_device_watcher_win.h @@ -13,7 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/storage_monitor/storage_monitor.h" namespace base { diff --git a/chrome/browser/storage_monitor/removable_device_constants.h b/chrome/browser/storage_monitor/removable_device_constants.h index 7d32c9b..c63587a 100644 --- a/chrome/browser/storage_monitor/removable_device_constants.h +++ b/chrome/browser/storage_monitor/removable_device_constants.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_STORAGE_MONITOR_REMOVABLE_DEVICE_CONSTANTS_H_ #include "base/files/file_path.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "build/build_config.h" namespace chrome { diff --git a/chrome/browser/storage_monitor/storage_info.h b/chrome/browser/storage_monitor/storage_info.h index d24d585..907b2a9 100644 --- a/chrome/browser/storage_monitor/storage_info.h +++ b/chrome/browser/storage_monitor/storage_info.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_STORAGE_MONITOR_STORAGE_INFO_H_ #include "base/files/file_path.h" -#include "base/string16.h" +#include "base/strings/string16.h" namespace chrome { diff --git a/chrome/browser/storage_monitor/storage_monitor.h b/chrome/browser/storage_monitor/storage_monitor.h index 976bbdd..dc49de5 100644 --- a/chrome/browser/storage_monitor/storage_monitor.h +++ b/chrome/browser/storage_monitor/storage_monitor.h @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/files/file_path.h" #include "base/observer_list_threadsafe.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/synchronization/lock.h" #include "chrome/browser/storage_monitor/storage_info.h" diff --git a/chrome/browser/storage_monitor/storage_monitor_chromeos.cc b/chrome/browser/storage_monitor/storage_monitor_chromeos.cc index 963d1e4..c61f530 100644 --- a/chrome/browser/storage_monitor/storage_monitor_chromeos.cc +++ b/chrome/browser/storage_monitor/storage_monitor_chromeos.cc @@ -10,9 +10,9 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/stl_util.h" -#include "base/string16.h" -#include "base/string_util.h" +#include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/storage_monitor/media_storage_util.h" #include "chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h" diff --git a/chrome/browser/storage_monitor/storage_monitor_linux.cc b/chrome/browser/storage_monitor/storage_monitor_linux.cc index 0c1a193..4fc60a2 100644 --- a/chrome/browser/storage_monitor/storage_monitor_linux.cc +++ b/chrome/browser/storage_monitor/storage_monitor_linux.cc @@ -18,8 +18,8 @@ #include "base/process.h" #include "base/process_util.h" #include "base/stl_util.h" -#include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/storage_monitor/media_storage_util.h" #include "chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h" diff --git a/chrome/browser/storage_monitor/test_portable_device_watcher_win.h b/chrome/browser/storage_monitor/test_portable_device_watcher_win.h index 1cb7284..04e4342 100644 --- a/chrome/browser/storage_monitor/test_portable_device_watcher_win.h +++ b/chrome/browser/storage_monitor/test_portable_device_watcher_win.h @@ -10,7 +10,7 @@ #include <string> -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/storage_monitor/portable_device_watcher_win.h" namespace chrome { diff --git a/chrome/browser/storage_monitor/test_volume_mount_watcher_win.h b/chrome/browser/storage_monitor/test_volume_mount_watcher_win.h index 0f1d7e6..f2dcbe6 100644 --- a/chrome/browser/storage_monitor/test_volume_mount_watcher_win.h +++ b/chrome/browser/storage_monitor/test_volume_mount_watcher_win.h @@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/storage_monitor/volume_mount_watcher_win.h" diff --git a/chrome/browser/storage_monitor/volume_mount_watcher_win.cc b/chrome/browser/storage_monitor/volume_mount_watcher_win.cc index 4102ab2..0a9f626 100644 --- a/chrome/browser/storage_monitor/volume_mount_watcher_win.cc +++ b/chrome/browser/storage_monitor/volume_mount_watcher_win.cc @@ -13,9 +13,9 @@ #include "base/bind_helpers.h" #include "base/metrics/histogram.h" #include "base/stl_util.h" -#include "base/string_util.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/task_runner_util.h" #include "base/time.h" diff --git a/chrome/browser/storage_monitor/volume_mount_watcher_win.h b/chrome/browser/storage_monitor/volume_mount_watcher_win.h index 8ed0e61..72de81a 100644 --- a/chrome/browser/storage_monitor/volume_mount_watcher_win.h +++ b/chrome/browser/storage_monitor/volume_mount_watcher_win.h @@ -15,7 +15,7 @@ #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/sequenced_task_runner.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/storage_monitor/storage_info.h" #include "chrome/browser/storage_monitor/storage_monitor.h" |