diff options
47 files changed, 51 insertions, 51 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 194eb57..4e79bca 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -15,7 +15,7 @@ #include "base/prefs/pref_member.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/strings/utf_string_conversions.h" #include "base/time.h" #include "chrome/app/chrome_command_ids.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu.h b/chrome/browser/tab_contents/render_view_context_menu.h index bcd8934..3a3b18d 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.h +++ b/chrome/browser/tab_contents/render_view_context_menu.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/observer_list.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" #include "chrome/browser/extensions/context_menu_matcher.h" #include "chrome/browser/extensions/menu_manager.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu_browsertest.cc b/chrome/browser/tab_contents/render_view_context_menu_browsertest.cc index f8c401d..e9dc1ae 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_browsertest.cc +++ b/chrome/browser/tab_contents/render_view_context_menu_browsertest.cc @@ -5,7 +5,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" diff --git a/chrome/browser/tab_contents/spelling_menu_observer.h b/chrome/browser/tab_contents/spelling_menu_observer.h index f2bdbb0..3f2194e 100644 --- a/chrome/browser/tab_contents/spelling_menu_observer.h +++ b/chrome/browser/tab_contents/spelling_menu_observer.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_member.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/timer.h" #include "chrome/browser/spellchecker/spelling_service_client.h" #include "chrome/browser/tab_contents/render_view_context_menu_observer.h" diff --git a/chrome/browser/task_manager/background_resource_provider.cc b/chrome/browser/task_manager/background_resource_provider.cc index 65d2ec5..371af28 100644 --- a/chrome/browser/task_manager/background_resource_provider.cc +++ b/chrome/browser/task_manager/background_resource_provider.cc @@ -5,7 +5,7 @@ #include "chrome/browser/task_manager/background_resource_provider.h" #include "base/i18n/rtl.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/background/background_contents_service.h" #include "chrome/browser/background/background_contents_service_factory.h" diff --git a/chrome/browser/task_manager/background_resource_provider.h b/chrome/browser/task_manager/background_resource_provider.h index 48d6df4..b572118 100644 --- a/chrome/browser/task_manager/background_resource_provider.h +++ b/chrome/browser/task_manager/background_resource_provider.h @@ -8,7 +8,7 @@ #include <map> #include "base/basictypes.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/task_manager/resource_provider.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/task_manager/browser_process_resource_provider.cc b/chrome/browser/task_manager/browser_process_resource_provider.cc index 5335e2f..21cec0b 100644 --- a/chrome/browser/task_manager/browser_process_resource_provider.cc +++ b/chrome/browser/task_manager/browser_process_resource_provider.cc @@ -5,7 +5,7 @@ #include "chrome/browser/task_manager/browser_process_resource_provider.h" #include "base/command_line.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/task_manager/resource_provider.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/task_manager/child_process_resource_provider.cc b/chrome/browser/task_manager/child_process_resource_provider.cc index 2480a3e..67b0918 100644 --- a/chrome/browser/task_manager/child_process_resource_provider.cc +++ b/chrome/browser/task_manager/child_process_resource_provider.cc @@ -7,7 +7,7 @@ #include <vector> #include "base/i18n/rtl.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/task_manager/resource_provider.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/task_manager/extension_process_resource_provider.cc b/chrome/browser/task_manager/extension_process_resource_provider.cc index e83a16f..46fae4f 100644 --- a/chrome/browser/task_manager/extension_process_resource_provider.cc +++ b/chrome/browser/task_manager/extension_process_resource_provider.cc @@ -4,7 +4,7 @@ #include "chrome/browser/task_manager/extension_process_resource_provider.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/devtools/devtools_window.h" diff --git a/chrome/browser/task_manager/guest_resource_provider.cc b/chrome/browser/task_manager/guest_resource_provider.cc index 5e17851..1d7e016 100644 --- a/chrome/browser/task_manager/guest_resource_provider.cc +++ b/chrome/browser/task_manager/guest_resource_provider.cc @@ -4,7 +4,7 @@ #include "chrome/browser/task_manager/guest_resource_provider.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/task_manager/renderer_resource.h" diff --git a/chrome/browser/task_manager/notification_resource_provider.cc b/chrome/browser/task_manager/notification_resource_provider.cc index e994883..b8a78bc 100644 --- a/chrome/browser/task_manager/notification_resource_provider.cc +++ b/chrome/browser/task_manager/notification_resource_provider.cc @@ -4,7 +4,7 @@ #include "chrome/browser/task_manager/notification_resource_provider.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/notifications/balloon_host.h" diff --git a/chrome/browser/task_manager/panel_resource_provider.h b/chrome/browser/task_manager/panel_resource_provider.h index 4c47f5c..66dcbea 100644 --- a/chrome/browser/task_manager/panel_resource_provider.h +++ b/chrome/browser/task_manager/panel_resource_provider.h @@ -8,7 +8,7 @@ #include <map> #include "base/basictypes.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/task_manager/resource_provider.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/task_manager/resource_provider.h b/chrome/browser/task_manager/resource_provider.h index 97e4db9..76cc865 100644 --- a/chrome/browser/task_manager/resource_provider.h +++ b/chrome/browser/task_manager/resource_provider.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/process_util.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" class PrefRegistrySimple; diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 04d6eb3..bd8cd7a 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -11,9 +11,9 @@ #include "base/process_util.h" #include "base/rand_util.h" #include "base/stl_util.h" -#include "base/string16.h" -#include "base/stringprintf.h" +#include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/background/background_contents_service.h" #include "chrome/browser/background/background_contents_service_factory.h" diff --git a/chrome/browser/task_manager/task_manager.h b/chrome/browser/task_manager/task_manager.h index c5ff5b6..15ee34e 100644 --- a/chrome/browser/task_manager/task_manager.h +++ b/chrome/browser/task_manager/task_manager.h @@ -14,7 +14,7 @@ #include "base/memory/singleton.h" #include "base/observer_list.h" #include "base/process_util.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/timer.h" #include "chrome/browser/renderer_host/web_cache_manager.h" #include "chrome/browser/task_manager/resource_provider.h" diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index cf22b5c..0741bbe 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/task_manager/task_manager.h" #include "base/files/file_path.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/background/background_contents_service.h" #include "chrome/browser/background/background_contents_service_factory.h" diff --git a/chrome/browser/task_manager/task_manager_browsertest_util.cc b/chrome/browser/task_manager/task_manager_browsertest_util.cc index 30c1157..f711d28 100644 --- a/chrome/browser/task_manager/task_manager_browsertest_util.cc +++ b/chrome/browser/task_manager/task_manager_browsertest_util.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/message_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/profiles/profile.h" diff --git a/chrome/browser/task_manager/task_manager_util.cc b/chrome/browser/task_manager/task_manager_util.cc index f8164de..a79b639 100644 --- a/chrome/browser/task_manager/task_manager_util.cc +++ b/chrome/browser/task_manager/task_manager_util.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/i18n/rtl.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/task_manager/task_manager_util.h b/chrome/browser/task_manager/task_manager_util.h index 2d5aa9b..73be91b 100644 --- a/chrome/browser/task_manager/task_manager_util.h +++ b/chrome/browser/task_manager/task_manager_util.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_UTIL_H_ #include "base/basictypes.h" -#include "base/string16.h" +#include "base/strings/string16.h" class Profile; diff --git a/chrome/browser/task_manager/worker_resource_provider.cc b/chrome/browser/task_manager/worker_resource_provider.cc index e884438..7cfc2ca 100644 --- a/chrome/browser/task_manager/worker_resource_provider.cc +++ b/chrome/browser/task_manager/worker_resource_provider.cc @@ -7,7 +7,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index 74bf88d..0d8c7e2 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -9,8 +9,8 @@ #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.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 "base/threading/sequenced_worker_pool.h" #include "base/threading/thread_restrictions.h" diff --git a/chrome/browser/themes/theme_properties.cc b/chrome/browser/themes/theme_properties.cc index a5baccb..ec777b6 100644 --- a/chrome/browser/themes/theme_properties.cc +++ b/chrome/browser/themes/theme_properties.cc @@ -5,8 +5,8 @@ #include "chrome/browser/themes/theme_properties.h" #include "base/memory/scoped_ptr.h" -#include "base/string_util.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "chrome/browser/themes/browser_theme_pack.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index a2646e9..efc17b4 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc @@ -8,7 +8,7 @@ #include "base/memory/ref_counted_memory.h" #include "base/prefs/pref_service.h" #include "base/sequenced_task_runner.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" diff --git a/chrome/browser/themes/theme_syncable_service.cc b/chrome/browser/themes/theme_syncable_service.cc index 0d3396c..bf414d6 100644 --- a/chrome/browser/themes/theme_syncable_service.cc +++ b/chrome/browser/themes/theme_syncable_service.cc @@ -4,7 +4,7 @@ #include "chrome/browser/themes/theme_syncable_service.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/thumbnails/simple_thumbnail_crop_unittest.cc b/chrome/browser/thumbnails/simple_thumbnail_crop_unittest.cc index 4da6cd5..b0324a4 100644 --- a/chrome/browser/thumbnails/simple_thumbnail_crop_unittest.cc +++ b/chrome/browser/thumbnails/simple_thumbnail_crop_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/thumbnails/simple_thumbnail_crop.h" #include "base/basictypes.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "chrome/browser/thumbnails/thumbnailing_context.h" #include "chrome/common/render_messages.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/translate/translate_accept_languages.cc b/chrome/browser/translate/translate_accept_languages.cc index 6dde53d..b5985b0 100644 --- a/chrome/browser/translate/translate_accept_languages.cc +++ b/chrome/browser/translate/translate_accept_languages.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/prefs/pref_change_registrar.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 "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/translate/translate_manager.h" diff --git a/chrome/browser/translate/translate_browsertest.cc b/chrome/browser/translate/translate_browsertest.cc index 483214c..bb6ec05 100644 --- a/chrome/browser/translate/translate_browsertest.cc +++ b/chrome/browser/translate/translate_browsertest.cc @@ -6,7 +6,7 @@ #define CHROME_BROWSER_TRANSLATE_TRANSLATE_BROWSERTEST_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 "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/translate/translate_infobar_delegate.h" diff --git a/chrome/browser/translate/translate_language_list.cc b/chrome/browser/translate/translate_language_list.cc index 597ca46..1d5f1ab 100644 --- a/chrome/browser/translate/translate_language_list.cc +++ b/chrome/browser/translate/translate_language_list.cc @@ -9,8 +9,8 @@ #include "base/json/json_reader.h" #include "base/lazy_instance.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 "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/translate/translate_event_details.h" diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index e9bcb72..18183e6f 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -11,9 +11,9 @@ #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.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/time.h" #include "base/values.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index 3adc5f7..899f496 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_change_registrar.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/app/chrome_command_ids.h" diff --git a/chrome/browser/translate/translate_prefs.cc b/chrome/browser/translate/translate_prefs.cc index 0831128..ad71653 100644 --- a/chrome/browser/translate/translate_prefs.cc +++ b/chrome/browser/translate/translate_prefs.cc @@ -5,7 +5,7 @@ #include "chrome/browser/translate/translate_prefs.h" #include "base/prefs/pref_service.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "components/user_prefs/pref_registry_syncable.h" diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc index cf4b2a2..d56f33f 100644 --- a/chrome/browser/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector_impl.cc @@ -14,8 +14,8 @@ #include "base/memory/singleton.h" #include "base/metrics/field_trial.h" #include "base/path_service.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/time.h" #include "base/version.h" diff --git a/chrome/browser/user_style_sheet_watcher_unittest.cc b/chrome/browser/user_style_sheet_watcher_unittest.cc index 3f1e614..4911d0e 100644 --- a/chrome/browser/user_style_sheet_watcher_unittest.cc +++ b/chrome/browser/user_style_sheet_watcher_unittest.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/threading/thread.h" #include "chrome/test/base/testing_browser_process.h" #include "content/public/test/test_browser_thread.h" diff --git a/chrome/browser/value_store/leveldb_value_store.cc b/chrome/browser/value_store/leveldb_value_store.cc index 60b7c2e..54fc3c2 100644 --- a/chrome/browser/value_store/leveldb_value_store.cc +++ b/chrome/browser/value_store/leveldb_value_store.cc @@ -8,8 +8,8 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.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 "base/strings/sys_string_conversions.h" #include "content/public/browser/browser_thread.h" #include "third_party/leveldatabase/src/include/leveldb/iterator.h" diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc index 094b153..de8e048 100644 --- a/chrome/browser/web_applications/web_app.cc +++ b/chrome/browser/web_applications/web_app.cc @@ -8,7 +8,7 @@ #include "base/bind_helpers.h" #include "base/file_util.h" #include "base/i18n/file_util_icu.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/common/chrome_constants.h" diff --git a/chrome/browser/web_applications/web_app.h b/chrome/browser/web_applications/web_app.h index 2e529b1..f4c647c 100644 --- a/chrome/browser/web_applications/web_app.h +++ b/chrome/browser/web_applications/web_app.h @@ -9,7 +9,7 @@ #include <vector> #include "base/files/file_path.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "build/build_config.h" #include "chrome/browser/shell_integration.h" #include "chrome/common/web_application_info.h" diff --git a/chrome/browser/web_applications/web_app_mac.h b/chrome/browser/web_applications/web_app_mac.h index d20aa22..676b208 100644 --- a/chrome/browser/web_applications/web_app_mac.h +++ b/chrome/browser/web_applications/web_app_mac.h @@ -7,7 +7,7 @@ #include "base/files/file_path.h" #include "base/gtest_prod_util.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/shell_integration.h" #ifdef __OBJC__ diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm index 0439b32..825e908 100644 --- a/chrome/browser/web_applications/web_app_mac.mm +++ b/chrome/browser/web_applications/web_app_mac.mm @@ -18,9 +18,9 @@ #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/memory/scoped_nsobject.h" +#include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/string_util.h" #include "chrome/browser/ui/web_applications/web_app_ui.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_paths_internal.h" diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc index 1f4bb35..e078f88 100644 --- a/chrome/browser/web_applications/web_app_unittest.cc +++ b/chrome/browser/web_applications/web_app_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/web_applications/web_app.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 "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/favicon/favicon_tab_helper.h" diff --git a/chrome/browser/web_applications/web_app_win.cc b/chrome/browser/web_applications/web_app_win.cc index 5539c2f..9e3c5ee 100644 --- a/chrome/browser/web_applications/web_app_win.cc +++ b/chrome/browser/web_applications/web_app_win.cc @@ -11,8 +11,8 @@ #include "base/logging.h" #include "base/md5.h" #include "base/path_service.h" -#include "base/stringprintf.h" #include "base/strings/string_piece.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/win/shortcut.h" #include "base/win/windows_version.h" diff --git a/chrome/browser/web_resource/notification_promo.cc b/chrome/browser/web_resource/notification_promo.cc index b26b075..f0869e4 100644 --- a/chrome/browser/web_resource/notification_promo.cc +++ b/chrome/browser/web_resource/notification_promo.cc @@ -12,8 +12,8 @@ #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/rand_util.h" -#include "base/string_util.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" #include "base/sys_info.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" diff --git a/chrome/browser/web_resource/promo_resource_service_unittest.cc b/chrome/browser/web_resource/promo_resource_service_unittest.cc index f7e2024..8c7c98f 100644 --- a/chrome/browser/web_resource/promo_resource_service_unittest.cc +++ b/chrome/browser/web_resource/promo_resource_service_unittest.cc @@ -9,8 +9,8 @@ #include "base/json/json_reader.h" #include "base/message_loop.h" #include "base/prefs/pref_service.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/time.h" #include "base/values.h" diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc index 2190dd0..94f00b3 100644 --- a/chrome/browser/web_resource/web_resource_service.cc +++ b/chrome/browser/web_resource/web_resource_service.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/message_loop.h" #include "base/prefs/pref_service.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/time.h" #include "base/values.h" diff --git a/chrome/browser/webdata/keyword_table.cc b/chrome/browser/webdata/keyword_table.cc index 9253cd1..3560bb3 100644 --- a/chrome/browser/webdata/keyword_table.cc +++ b/chrome/browser/webdata/keyword_table.cc @@ -10,9 +10,9 @@ #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/string_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/values.h" #include "chrome/browser/history/history_database.h" diff --git a/chrome/browser/webdata/keyword_table.h b/chrome/browser/webdata/keyword_table.h index a608aab..0d6737c 100644 --- a/chrome/browser/webdata/keyword_table.h +++ b/chrome/browser/webdata/keyword_table.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/search_engines/template_url_id.h" #include "components/webdata/common/web_database_table.h" diff --git a/chrome/browser/webdata/web_intents_table.cc b/chrome/browser/webdata/web_intents_table.cc index 3d8d440..cdd9472 100644 --- a/chrome/browser/webdata/web_intents_table.cc +++ b/chrome/browser/webdata/web_intents_table.cc @@ -8,7 +8,7 @@ #include "base/i18n/case_conversion.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "components/webdata/common/web_database.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/webdata/web_intents_table.h b/chrome/browser/webdata/web_intents_table.h index 4dd48e3..d8c2041 100644 --- a/chrome/browser/webdata/web_intents_table.h +++ b/chrome/browser/webdata/web_intents_table.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "components/webdata/common/web_database_table.h" namespace sql { |