diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-10 20:22:31 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-10 20:22:31 +0000 |
| commit | f9b294366f85223697866b32ff47a5bbd6b768e3 (patch) | |
| tree | 55bb100da2e9314397c0ab0cd007ec819cc03fbe | |
| parent | 5bad2f7234e08a8f32ad78b12223bbb4945ee03e (diff) | |
| download | chromium_src-f9b294366f85223697866b32ff47a5bbd6b768e3.zip chromium_src-f9b294366f85223697866b32ff47a5bbd6b768e3.tar.gz chromium_src-f9b294366f85223697866b32ff47a5bbd6b768e3.tar.bz2 | |
Use a direct include of strings headers in chrome/browser/j*-n*/.
BUG=247723
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/15897014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205293 0039d316-1c4b-4281-b951-d872f2087c98
57 files changed, 63 insertions, 63 deletions
diff --git a/chrome/browser/jankometer.cc b/chrome/browser/jankometer.cc index 0cc1388..af96cfc 100644 --- a/chrome/browser/jankometer.cc +++ b/chrome/browser/jankometer.cc @@ -14,7 +14,7 @@ #include "base/metrics/histogram.h" #include "base/metrics/stats_counters.h" #include "base/pending_task.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/threading/thread.h" #include "base/threading/watchdog.h" #include "base/time.h" diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index ac301439..d78a9fd 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -17,7 +17,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/path_service.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" #include "base/win/scoped_comptr.h" diff --git a/chrome/browser/language_usage_metrics.cc b/chrome/browser/language_usage_metrics.cc index 0940ff0..62ed43c 100644 --- a/chrome/browser/language_usage_metrics.cc +++ b/chrome/browser/language_usage_metrics.cc @@ -7,8 +7,8 @@ #include <algorithm> #include "base/metrics/sparse_histogram.h" -#include "base/string_util.h" #include "base/strings/string_tokenizer.h" +#include "base/strings/string_util.h" namespace { void RecordAcceptLanguage(int language_code) { diff --git a/chrome/browser/mac/install_from_dmg.mm b/chrome/browser/mac/install_from_dmg.mm index 20131a5..56912db 100644 --- a/chrome/browser/mac/install_from_dmg.mm +++ b/chrome/browser/mac/install_from_dmg.mm @@ -29,7 +29,7 @@ #include "base/mac/scoped_cftyperef.h" #include "base/mac/scoped_ioobject.h" #include "base/mac/scoped_nsautorelease_pool.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/mac/dock.h" #import "chrome/browser/mac/keystone_glue.h" diff --git a/chrome/browser/mac/keychain_reauthorize.mm b/chrome/browser/mac/keychain_reauthorize.mm index ebab69d..3e91511 100644 --- a/chrome/browser/mac/keychain_reauthorize.mm +++ b/chrome/browser/mac/keychain_reauthorize.mm @@ -16,7 +16,7 @@ #include "base/mac/scoped_cftyperef.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/mac/security_wrappers.h" diff --git a/chrome/browser/mac/keystone_glue.h b/chrome/browser/mac/keystone_glue.h index 100ffad..8b696c2 100644 --- a/chrome/browser/mac/keystone_glue.h +++ b/chrome/browser/mac/keystone_glue.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_ #define CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_ -#include "base/string16.h" +#include "base/strings/string16.h" #if defined(__OBJC__) diff --git a/chrome/browser/mac/relauncher.cc b/chrome/browser/mac/relauncher.cc index 7b9d3a3..1f3db81 100644 --- a/chrome/browser/mac/relauncher.cc +++ b/chrome/browser/mac/relauncher.cc @@ -26,7 +26,7 @@ #include "base/path_service.h" #include "base/posix/eintr_wrapper.h" #include "base/process_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/mac/install_from_dmg.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/managed_mode/managed_mode_navigation_observer.cc b/chrome/browser/managed_mode/managed_mode_navigation_observer.cc index e474b90..c7666f8 100644 --- a/chrome/browser/managed_mode/managed_mode_navigation_observer.cc +++ b/chrome/browser/managed_mode/managed_mode_navigation_observer.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/metrics/histogram.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/history_types.h" diff --git a/chrome/browser/managed_mode/managed_mode_url_filter.cc b/chrome/browser/managed_mode/managed_mode_url_filter.cc index 4787a06..e63a791 100644 --- a/chrome/browser/managed_mode/managed_mode_url_filter.cc +++ b/chrome/browser/managed_mode/managed_mode_url_filter.cc @@ -9,8 +9,8 @@ #include "base/json/json_file_value_serializer.h" #include "base/metrics/histogram.h" #include "base/sha1.h" -#include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/task_runner_util.h" #include "base/threading/sequenced_worker_pool.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc index d0c8ec1..de1a0fa 100644 --- a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc +++ b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc @@ -7,8 +7,8 @@ #include "base/callback.h" #include "base/json/json_reader.h" #include "base/logging.h" -#include "base/string16.h" -#include "base/stringprintf.h" +#include "base/strings/string16.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/signin/oauth2_token_service.h" diff --git a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.h b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.h index 392f383..e29cdbe 100644 --- a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.h +++ b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.h @@ -10,7 +10,7 @@ #include "base/callback_forward.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" class GoogleServiceAuthError; class OAuth2TokenService; diff --git a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc index 83c8285..d488c11 100644 --- a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc +++ b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc @@ -5,7 +5,7 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/managed_mode/managed_user_refresh_token_fetcher.h" #include "chrome/browser/signin/oauth2_token_service.h" diff --git a/chrome/browser/managed_mode/managed_user_registration_service.h b/chrome/browser/managed_mode/managed_user_registration_service.h index 9b8ce7f..00364f6 100644 --- a/chrome/browser/managed_mode/managed_user_registration_service.h +++ b/chrome/browser/managed_mode/managed_user_registration_service.h @@ -11,7 +11,7 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" #include "base/prefs/pref_change_registrar.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/timer.h" #include "chrome/browser/profiles/profile_manager.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" diff --git a/chrome/browser/managed_mode/managed_user_service.h b/chrome/browser/managed_mode/managed_user_service.h index 26210a5..37a5504 100644 --- a/chrome/browser/managed_mode/managed_user_service.h +++ b/chrome/browser/managed_mode/managed_user_service.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_change_registrar.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/extensions/management_policy.h" #include "chrome/browser/managed_mode/managed_mode_url_filter.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/media/chrome_webrtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_browsertest.cc index 916a4bb..4951511 100644 --- a/chrome/browser/media/chrome_webrtc_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_browsertest.cc @@ -5,7 +5,7 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/time.h" #include "chrome/browser/infobars/infobar.h" #include "chrome/browser/infobars/infobar_service.h" diff --git a/chrome/browser/media/webrtc_log_uploader.cc b/chrome/browser/media/webrtc_log_uploader.cc index fa85286..f88e382 100644 --- a/chrome/browser/media/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc_log_uploader.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/shared_memory.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/partial_circular_buffer.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index d300cdc..d9e9582 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -8,8 +8,8 @@ #include "base/file_version_info.h" #include "base/metrics/histogram.h" #include "base/process_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 "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/memory_details.h b/chrome/browser/memory_details.h index d01ed46..66094f2 100644 --- a/chrome/browser/memory_details.h +++ b/chrome/browser/memory_details.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/process_util.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "content/public/common/process_type.h" // We collect data about each browser process. A browser may diff --git a/chrome/browser/memory_details_linux.cc b/chrome/browser/memory_details_linux.cc index e02aeb2..6c2a55c 100644 --- a/chrome/browser/memory_details_linux.cc +++ b/chrome/browser/memory_details_linux.cc @@ -12,7 +12,7 @@ #include "base/bind.h" #include "base/process_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_constants.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc index ebba44e..a7ba52c 100644 --- a/chrome/browser/memory_details_mac.cc +++ b/chrome/browser/memory_details_mac.cc @@ -13,7 +13,7 @@ #include "base/files/file_path.h" #include "base/mac/mac_util.h" #include "base/process_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" #include "chrome/browser/process_info_snapshot.h" diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc index 72e42eb..5ce6032 100644 --- a/chrome/browser/memory_details_win.cc +++ b/chrome/browser/memory_details_win.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/file_version_info.h" #include "base/files/file_path.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc index 1aaeda0..ff05220 100644 --- a/chrome/browser/metrics/metrics_log.cc +++ b/chrome/browser/metrics/metrics_log.cc @@ -16,8 +16,8 @@ #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/profiler/alternate_timer.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 "base/sys_info.h" #include "base/third_party/nspr/prtime.h" diff --git a/chrome/browser/metrics/metrics_log_unittest.cc b/chrome/browser/metrics/metrics_log_unittest.cc index 8dd1a3f..b78c0d7 100644 --- a/chrome/browser/metrics/metrics_log_unittest.cc +++ b/chrome/browser/metrics/metrics_log_unittest.cc @@ -9,8 +9,8 @@ #include "base/port.h" #include "base/prefs/pref_service.h" #include "base/prefs/testing_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/threading/sequenced_worker_pool.h" #include "base/time.h" #include "base/tracked_objects.h" diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc index 4109105..39dc136 100644 --- a/chrome/browser/metrics/thread_watcher.cc +++ b/chrome/browser/metrics/thread_watcher.cc @@ -10,10 +10,10 @@ #include "base/compiler_specific.h" #include "base/debug/alias.h" #include "base/lazy_instance.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/strings/stringprintf.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" #include "chrome/browser/metrics/metrics_service.h" diff --git a/chrome/browser/metrics/variations/variations_registry_syncer_win.cc b/chrome/browser/metrics/variations/variations_registry_syncer_win.cc index f4143b8..38e500a 100644 --- a/chrome/browser/metrics/variations/variations_registry_syncer_win.cc +++ b/chrome/browser/metrics/variations/variations_registry_syncer_win.cc @@ -7,7 +7,7 @@ #include "base/files/file_path.h" #include "base/metrics/field_trial.h" #include "base/path_service.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/common/metrics/variations/variations_util.h" #include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/install_util.h" diff --git a/chrome/browser/metrics/variations/variations_service_unittest.cc b/chrome/browser/metrics/variations/variations_service_unittest.cc index 87f1b70..625b616 100644 --- a/chrome/browser/metrics/variations/variations_service_unittest.cc +++ b/chrome/browser/metrics/variations/variations_service_unittest.cc @@ -7,8 +7,8 @@ #include "base/base64.h" #include "base/command_line.h" #include "base/prefs/testing_pref_service.h" -#include "base/string_util.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "chrome/browser/metrics/proto/study.pb.h" #include "chrome/browser/metrics/variations/variations_service.h" #include "chrome/browser/web_resource/resource_request_allowed_notifier_test_util.h" diff --git a/chrome/browser/nacl_host/nacl_infobar.cc b/chrome/browser/nacl_host/nacl_infobar.cc index 91474f2..7583c22 100644 --- a/chrome/browser/nacl_host/nacl_infobar.cc +++ b/chrome/browser/nacl_host/nacl_infobar.cc @@ -5,7 +5,7 @@ #include "chrome/browser/nacl_host/nacl_infobar.h" #include "base/bind.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar_service.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 9c9f1af..dccd4d9f 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -15,10 +15,10 @@ #include "base/metrics/histogram.h" #include "base/path_service.h" #include "base/process_util.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_util.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/win/windows_version.h" #include "build/build_config.h" diff --git a/chrome/browser/net/async_dns_field_trial.cc b/chrome/browser/net/async_dns_field_trial.cc index 8c3251d..9feecc6 100644 --- a/chrome/browser/net/async_dns_field_trial.cc +++ b/chrome/browser/net/async_dns_field_trial.cc @@ -5,7 +5,7 @@ #include "chrome/browser/net/async_dns_field_trial.h" #include "base/metrics/field_trial.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "build/build_config.h" namespace chrome_browser_net { diff --git a/chrome/browser/net/chrome_net_log.cc b/chrome/browser/net/chrome_net_log.cc index 7e9a2fc..093b0b5a 100644 --- a/chrome/browser/net/chrome_net_log.cc +++ b/chrome/browser/net/chrome_net_log.cc @@ -8,8 +8,8 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/values.h" #include "chrome/browser/net/net_log_logger.h" #include "chrome/browser/net/net_log_temp_file.h" diff --git a/chrome/browser/net/evicted_domain_cookie_counter.cc b/chrome/browser/net/evicted_domain_cookie_counter.cc index c9b244e..2d9590a 100644 --- a/chrome/browser/net/evicted_domain_cookie_counter.cc +++ b/chrome/browser/net/evicted_domain_cookie_counter.cc @@ -9,7 +9,7 @@ #include "base/metrics/histogram.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "chrome/browser/google/google_util.h" #include "net/cookies/canonical_cookie.h" diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher.cc b/chrome/browser/net/gaia/gaia_oauth_fetcher.cc index d2b08f3..8776c63 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_util.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.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 359e6a7..042a5a2 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/stringprintf.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/stringprintf.h" #include "chrome/browser/io_thread.h" #include "chrome/common/chrome_version_info.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc b/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc index 9c9d8a6..793c5f1 100644 --- a/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc +++ b/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc @@ -15,7 +15,7 @@ #include "base/metrics/statistics_recorder.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/net/http_server_properties_manager.cc b/chrome/browser/net/http_server_properties_manager.cc index 70229c3..6dc629a 100644 --- a/chrome/browser/net/http_server_properties_manager.cc +++ b/chrome/browser/net/http_server_properties_manager.cc @@ -8,8 +8,8 @@ #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" #include "base/values.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/net/load_timing_browsertest.cc b/chrome/browser/net/load_timing_browsertest.cc index e08ba23..b42bbf8 100644 --- a/chrome/browser/net/load_timing_browsertest.cc +++ b/chrome/browser/net/load_timing_browsertest.cc @@ -12,7 +12,7 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/net/network_stats.cc b/chrome/browser/net/network_stats.cc index a7c1b6a..c0c823f 100644 --- a/chrome/browser/net/network_stats.cc +++ b/chrome/browser/net/network_stats.cc @@ -10,7 +10,7 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/rand_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/threading/platform_thread.h" #include "base/time.h" #include "base/tuple.h" diff --git a/chrome/browser/net/network_stats.h b/chrome/browser/net/network_stats.h index 714c1c3..8875ee3 100644 --- a/chrome/browser/net/network_stats.h +++ b/chrome/browser/net/network_stats.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/time.h" #include "chrome/browser/io_thread.h" #include "net/base/address_list.h" diff --git a/chrome/browser/net/network_stats_unittest.cc b/chrome/browser/net/network_stats_unittest.cc index 990419f..cb5279f 100644 --- a/chrome/browser/net/network_stats_unittest.cc +++ b/chrome/browser/net/network_stats_unittest.cc @@ -4,7 +4,7 @@ #include "base/basictypes.h" #include "base/message_loop.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "chrome/browser/net/network_stats.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc index 9afc374..4b42e6f 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_util.h" -#include "base/stringprintf.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc index 7473257..ca4a737 100644 --- a/chrome/browser/net/proxy_browsertest.cc +++ b/chrome/browser/net/proxy_browsertest.cc @@ -4,8 +4,8 @@ #include "base/command_line.h" #include "base/path_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 "chrome/browser/ui/browser.h" #include "chrome/browser/ui/login/login_prompt.h" diff --git a/chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy.cc b/chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy.cc index 3c2ec18..19335b6 100644 --- a/chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy.cc +++ b/chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy.cc @@ -8,7 +8,7 @@ #include "base/i18n/icu_string_conversions.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 "net/base/net_errors.h" #include "net/http/http_auth.h" diff --git a/chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy_unittest.cc b/chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy_unittest.cc index ed4f1e9..7d7a736 100644 --- a/chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy_unittest.cc +++ b/chrome/browser/net/spdyproxy/http_auth_handler_spdyproxy_unittest.cc @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "net/base/net_errors.h" #include "net/http/http_request_info.h" diff --git a/chrome/browser/net/sqlite_server_bound_cert_store.cc b/chrome/browser/net/sqlite_server_bound_cert_store.cc index 6c0905a..698ace0 100644 --- a/chrome/browser/net/sqlite_server_bound_cert_store.cc +++ b/chrome/browser/net/sqlite_server_bound_cert_store.cc @@ -14,7 +14,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.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/diagnostics/sqlite_diagnostics.h" diff --git a/chrome/browser/net/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc index ef3c5628..fc68d2a 100644 --- a/chrome/browser/net/url_fixer_upper.cc +++ b/chrome/browser/net/url_fixer_upper.cc @@ -11,7 +11,7 @@ #endif #include "base/file_util.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/url_constants.h" #include "googleurl/src/url_file.h" diff --git a/chrome/browser/net/url_fixer_upper.h b/chrome/browser/net/url_fixer_upper.h index 0a137d8..eaf89c8 100644 --- a/chrome/browser/net/url_fixer_upper.h +++ b/chrome/browser/net/url_fixer_upper.h @@ -7,7 +7,7 @@ #include <string> -#include "base/string16.h" +#include "base/strings/string16.h" #include "googleurl/src/gurl.h" namespace base { diff --git a/chrome/browser/net/url_fixer_upper_unittest.cc b/chrome/browser/net/url_fixer_upper_unittest.cc index 1119933..706418a 100644 --- a/chrome/browser/net/url_fixer_upper_unittest.cc +++ b/chrome/browser/net/url_fixer_upper_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/file_util.h" #include "base/path_service.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/net/url_info.cc b/chrome/browser/net/url_info.cc index 1046827..4069a2a 100644 --- a/chrome/browser/net/url_info.cc +++ b/chrome/browser/net/url_info.cc @@ -14,7 +14,7 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" using base::Time; using base::TimeDelta; diff --git a/chrome/browser/net/websocket_browsertest.cc b/chrome/browser/net/websocket_browsertest.cc index 4eb13ce..444a032 100644 --- a/chrome/browser/net/websocket_browsertest.cc +++ b/chrome/browser/net/websocket_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" diff --git a/chrome/browser/notifications/desktop_notification_service.h b/chrome/browser/notifications/desktop_notification_service.h index 866b63f..484f93d 100644 --- a/chrome/browser/notifications/desktop_notification_service.h +++ b/chrome/browser/notifications/desktop_notification_service.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/prefs/pref_member.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/content_settings/content_settings_provider.h" #include "chrome/common/content_settings.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc index 572022f..f63610f 100644 --- a/chrome/browser/notifications/desktop_notifications_unittest.cc +++ b/chrome/browser/notifications/desktop_notifications_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/notifications/desktop_notifications_unittest.h" #include "base/prefs/testing_pref_service.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/notifications/balloon_notification_ui_manager.h" #include "chrome/browser/notifications/fake_balloon_view.h" diff --git a/chrome/browser/notifications/message_center_notifications_browsertest.cc b/chrome/browser/notifications/message_center_notifications_browsertest.cc index ddf5100..4cd7ce7 100644 --- a/chrome/browser/notifications/message_center_notifications_browsertest.cc +++ b/chrome/browser/notifications/message_center_notifications_browsertest.cc @@ -7,8 +7,8 @@ #include "base/command_line.h" #include "base/message_loop.h" #include "base/run_loop.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/browser_process.h" #include "chrome/browser/notifications/message_center_notification_manager.h" diff --git a/chrome/browser/notifications/notification.cc b/chrome/browser/notifications/notification.cc index 592ca43..eb478ee 100644 --- a/chrome/browser/notifications/notification.cc +++ b/chrome/browser/notifications/notification.cc @@ -4,7 +4,7 @@ #include "chrome/browser/notifications/notification.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "ui/message_center/message_center_util.h" #include "ui/webui/web_ui_util.h" diff --git a/chrome/browser/notifications/notification.h b/chrome/browser/notifications/notification.h index 3936aea..73ffc03 100644 --- a/chrome/browser/notifications/notification.h +++ b/chrome/browser/notifications/notification.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/values.h" #include "chrome/browser/notifications/notification_delegate.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc index f490119..3a673a0 100644 --- a/chrome/browser/notifications/notification_browsertest.cc +++ b/chrome/browser/notifications/notification_browsertest.cc @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.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/browser_process.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" diff --git a/chrome/browser/notifications/notification_object_proxy.cc b/chrome/browser/notifications/notification_object_proxy.cc index fe2cadd..f4016f2 100644 --- a/chrome/browser/notifications/notification_object_proxy.cc +++ b/chrome/browser/notifications/notification_object_proxy.cc @@ -4,7 +4,7 @@ #include "chrome/browser/notifications/notification_object_proxy.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "content/public/browser/render_view_host.h" using content::RenderViewHost; diff --git a/chrome/browser/notifications/notification_ui_manager_mac.h b/chrome/browser/notifications/notification_ui_manager_mac.h index 9286768..709e2d2 100644 --- a/chrome/browser/notifications/notification_ui_manager_mac.h +++ b/chrome/browser/notifications/notification_ui_manager_mac.h @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/notifications/balloon_notification_ui_manager.h" @protocol CrUserNotification; |