diff options
30 files changed, 36 insertions, 36 deletions
diff --git a/chrome/browser/devtools/adb_client_socket.cc b/chrome/browser/devtools/adb_client_socket.cc index 615b1be..0871c0a 100644 --- a/chrome/browser/devtools/adb_client_socket.cc +++ b/chrome/browser/devtools/adb_client_socket.cc @@ -6,9 +6,9 @@ #include "base/bind.h" #include "base/compiler_specific.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 "net/base/address_list.h" #include "net/base/completion_callback.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.cc b/chrome/browser/devtools/browser_list_tabcontents_provider.cc index 08a462a..41d7001 100644 --- a/chrome/browser/devtools/browser_list_tabcontents_provider.cc +++ b/chrome/browser/devtools/browser_list_tabcontents_provider.cc @@ -5,7 +5,7 @@ #include "chrome/browser/devtools/browser_list_tabcontents_provider.h" #include "base/path_service.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" diff --git a/chrome/browser/devtools/devtools_adb_bridge.cc b/chrome/browser/devtools/devtools_adb_bridge.cc index 139f44c..39b5ecc 100644 --- a/chrome/browser/devtools/devtools_adb_bridge.cc +++ b/chrome/browser/devtools/devtools_adb_bridge.cc @@ -14,9 +14,9 @@ #include "base/logging.h" #include "base/message_loop/message_loop_proxy.h" #include "base/rand_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/thread.h" #include "base/values.h" #include "chrome/browser/devtools/adb_client_socket.h" diff --git a/chrome/browser/devtools/devtools_file_helper.h b/chrome/browser/devtools/devtools_file_helper.h index 4669d93..3437b51 100644 --- a/chrome/browser/devtools/devtools_file_helper.h +++ b/chrome/browser/devtools/devtools_file_helper.h @@ -13,7 +13,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" class Profile; diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc index 4d22f41..c9107e3 100644 --- a/chrome/browser/devtools/devtools_sanity_browsertest.cc +++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/path_service.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/test/test_timeouts.h" #include "chrome/browser/devtools/browser_list_tabcontents_provider.h" diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc index 6c303e8..98a2e25 100644 --- a/chrome/browser/devtools/devtools_window.cc +++ b/chrome/browser/devtools/devtools_window.cc @@ -9,8 +9,8 @@ #include "base/command_line.h" #include "base/json/json_writer.h" #include "base/lazy_instance.h" -#include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/devtools/devtools_window.h b/chrome/browser/devtools/devtools_window.h index b241bda..9225994 100644 --- a/chrome/browser/devtools/devtools_window.h +++ b/chrome/browser/devtools/devtools_window.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/devtools/devtools_file_helper.h" #include "chrome/browser/devtools/devtools_toggle_action.h" #include "content/public/browser/devtools_client_host.h" diff --git a/chrome/browser/devtools/tethering_adb_filter.cc b/chrome/browser/devtools/tethering_adb_filter.cc index 7505f8f..c06c2bc 100644 --- a/chrome/browser/devtools/tethering_adb_filter.cc +++ b/chrome/browser/devtools/tethering_adb_filter.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/compiler_specific.h" #include "base/json/json_reader.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/devtools/adb_client_socket.h" #include "net/base/address_list.h" diff --git a/chrome/browser/diagnostics/diagnostics_main.cc b/chrome/browser/diagnostics/diagnostics_main.cc index 79e0793..cd9530ba 100644 --- a/chrome/browser/diagnostics/diagnostics_main.cc +++ b/chrome/browser/diagnostics/diagnostics_main.cc @@ -17,7 +17,7 @@ #include "base/command_line.h" #include "base/i18n/icu_util.h" #include "base/logging.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" diff --git a/chrome/browser/diagnostics/diagnostics_model.cc b/chrome/browser/diagnostics/diagnostics_model.cc index ddec51c..6f96d06 100644 --- a/chrome/browser/diagnostics/diagnostics_model.cc +++ b/chrome/browser/diagnostics/diagnostics_model.cc @@ -12,7 +12,7 @@ #include "base/files/file_path.h" #include "base/path_service.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "chrome/browser/diagnostics/diagnostics_test.h" #include "chrome/browser/diagnostics/recon_diagnostics.h" #include "chrome/browser/diagnostics/sqlite_diagnostics.h" diff --git a/chrome/browser/diagnostics/diagnostics_model.h b/chrome/browser/diagnostics/diagnostics_model.h index 6a98725..466020b 100644 --- a/chrome/browser/diagnostics/diagnostics_model.h +++ b/chrome/browser/diagnostics/diagnostics_model.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_DIAGNOSTICS_DIAGNOSTICS_MODEL_H_ #define CHROME_BROWSER_DIAGNOSTICS_DIAGNOSTICS_MODEL_H_ -#include "base/string16.h" +#include "base/strings/string16.h" class CommandLine; diff --git a/chrome/browser/diagnostics/diagnostics_test.h b/chrome/browser/diagnostics/diagnostics_test.h index d1c430a..eed176d 100644 --- a/chrome/browser/diagnostics/diagnostics_test.h +++ b/chrome/browser/diagnostics/diagnostics_test.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_DIAGNOSTICS_DIAGNOSTICS_TEST_H_ #include "base/compiler_specific.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/diagnostics/diagnostics_model.h" namespace base { diff --git a/chrome/browser/diagnostics/recon_diagnostics.cc b/chrome/browser/diagnostics/recon_diagnostics.cc index 68a7c10..b4be36b 100644 --- a/chrome/browser/diagnostics/recon_diagnostics.cc +++ b/chrome/browser/diagnostics/recon_diagnostics.cc @@ -10,9 +10,9 @@ #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.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/sys_info.h" #include "chrome/browser/diagnostics/diagnostics_test.h" diff --git a/chrome/browser/do_not_track_browsertest.cc b/chrome/browser/do_not_track_browsertest.cc index 05f45e9..561fa85 100644 --- a/chrome/browser/do_not_track_browsertest.cc +++ b/chrome/browser/do_not_track_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/prefs/pref_service.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc index 3c92a3e..f894dc0 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc @@ -13,7 +13,7 @@ #include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" #include "base/rand_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/time.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index bb9eb96..2f9700c 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -13,8 +13,8 @@ #include "base/path_service.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" -#include "base/stringprintf.h" #include "base/strings/string_split.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/sys_info.h" #include "base/test/test_file_util.h" diff --git a/chrome/browser/download/download_extensions.cc b/chrome/browser/download/download_extensions.cc index 65ed58f..b8041b5 100644 --- a/chrome/browser/download/download_extensions.cc +++ b/chrome/browser/download/download_extensions.cc @@ -7,7 +7,7 @@ #include "chrome/browser/download/download_extensions.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "net/base/mime_util.h" #include "net/base/net_util.h" diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc index ec61cb5..347a554e 100644 --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc @@ -6,7 +6,7 @@ #include "base/i18n/number_formatting.h" #include "base/i18n/rtl.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/supports_user_data.h" diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h index d328470..66021d3 100644 --- a/chrome/browser/download/download_item_model.h +++ b/chrome/browser/download/download_item_model.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/string16.h" +#include "base/strings/string16.h" class SavePackage; diff --git a/chrome/browser/download/download_item_model_unittest.cc b/chrome/browser/download/download_item_model_unittest.cc index 47285e5..07cf1f2 100644 --- a/chrome/browser/download/download_item_model_unittest.cc +++ b/chrome/browser/download/download_item_model_unittest.cc @@ -9,8 +9,8 @@ #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/string16.h" -#include "base/string_util.h" +#include "base/strings/string16.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/public/test/mock_download_item.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/download/download_path_reservation_tracker.cc b/chrome/browser/download/download_path_reservation_tracker.cc index 3230331..554cc12 100644 --- a/chrome/browser/download/download_path_reservation_tracker.cc +++ b/chrome/browser/download/download_path_reservation_tracker.cc @@ -12,8 +12,8 @@ #include "base/logging.h" #include "base/path_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/third_party/icu/icu_utf.h" #include "chrome/browser/download/download_util.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/download/download_path_reservation_tracker_unittest.cc b/chrome/browser/download/download_path_reservation_tracker_unittest.cc index 897a2fd..67a3dfb 100644 --- a/chrome/browser/download/download_path_reservation_tracker_unittest.cc +++ b/chrome/browser/download/download_path_reservation_tracker_unittest.cc @@ -8,7 +8,7 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/observer_list.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/test/test_file_util.h" #include "chrome/browser/download/download_path_reservation_tracker.h" #include "chrome/browser/download/download_target_determiner.h" diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc index d719e59..33ac703 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_util.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/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 b524ffe..3f7ed10 100644 --- a/chrome/browser/download/download_query.cc +++ b/chrome/browser/download/download_query.cc @@ -17,9 +17,9 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" -#include "base/string16.h" -#include "base/stringprintf.h" +#include "base/strings/string16.h" #include "base/strings/string_split.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/download/download_query_unittest.cc b/chrome/browser/download/download_query_unittest.cc index 3a178ae..d7bf5a1 100644 --- a/chrome/browser/download/download_query_unittest.cc +++ b/chrome/browser/download/download_query_unittest.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/time.h" #include "base/values.h" #include "chrome/browser/download/download_query.h" diff --git a/chrome/browser/download/download_shelf_context_menu.h b/chrome/browser/download/download_shelf_context_menu.h index 0217580..b495c25 100644 --- a/chrome/browser/download/download_shelf_context_menu.h +++ b/chrome/browser/download/download_shelf_context_menu.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "content/public/browser/download_item.h" #include "ui/base/models/simple_menu_model.h" diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc index 73e89ca..1d23aba 100644 --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc @@ -6,7 +6,7 @@ #include "base/prefs/pref_service.h" #include "base/rand_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/time.h" #include "chrome/browser/download/chrome_download_manager_delegate.h" #include "chrome/browser/download/download_crx_util.h" diff --git a/chrome/browser/download/download_target_determiner_unittest.cc b/chrome/browser/download/download_target_determiner_unittest.cc index 2bb982a..d6ba1ce 100644 --- a/chrome/browser/download/download_target_determiner_unittest.cc +++ b/chrome/browser/download/download_target_determiner_unittest.cc @@ -9,7 +9,7 @@ #include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/value_conversions.h" #include "chrome/browser/download/chrome_download_manager_delegate.h" #include "chrome/browser/download/download_extensions.h" diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 8cbea50..5c2467a6c 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -17,7 +17,7 @@ #include "base/lazy_instance.h" #include "base/metrics/histogram.h" #include "base/path_service.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h index b74afbf..e5e9a60 100644 --- a/chrome/browser/download/download_util.h +++ b/chrome/browser/download/download_util.h @@ -12,7 +12,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 "ui/gfx/native_widget_types.h" #if defined(TOOLKIT_VIEWS) |