From c3d4a0d5d82206a7748b48433ad85e5bf7ac576e Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Thu, 20 Jun 2013 19:40:12 +0000 Subject: [PATCH] Use a direct include of strings headers, delete some strings forwarding headers. BUG=247723 TEST=everything compiles OK TBR=ben@chromium.org Review URL: https://codereview.chromium.org/17390010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207507 0039d316-1c4b-4281-b951-d872f2087c98 --- base/message_loop/message_pump_win.cc | 2 +- base/nullable_string16.h | 7 ------- base/string16.h | 7 ------- base/string_number_conversions.h | 7 ------- base/string_util_posix.h | 7 ------- base/string_util_win.h | 7 ------- base/strings/nullable_string16.cc | 2 +- base/utf_string_conversions.h | 6 ------ chrome/browser/chromeos/options/network_connect.cc | 2 +- .../extensions/activity_log/fullstream_ui_policy.cc | 2 +- .../browser/extensions/web_view_interactive_browsertest.cc | 2 +- .../media_galleries_dialog_controller_unittest.cc | 2 +- .../browser/notifications/notification_audio_controller.h | 2 +- chrome/browser/policy/managed_mode_policy_provider.cc | 2 +- chrome/browser/sync_file_system/drive_metadata_store.cc | 3 +-- .../notifications/message_center_tray_bridge_unittest.mm | 2 +- chrome/browser/ui/views/avatar_menu_button_browsertest.cc | 2 +- .../ui/webui/options/language_options_handler_common.cc | 2 +- chrome/browser/ui/webui/options/preferences_browsertest.cc | 2 +- .../autofill/content/browser/wallet/form_field_error.cc | 4 ++-- .../accessibility/accessibility_tree_formatter_android.cc | 6 +++--- .../browser/accessibility/browser_accessibility_android.cc | 2 +- .../accessibility/browser_accessibility_manager_android.cc | 2 +- content/test/accessibility_browser_test_utils.cc | 2 +- dbus/bus.cc | 2 +- media/base/audio_buffer_unittest.cc | 2 +- net/http/http_response_headers.h | 2 +- remoting/client/plugin/pepper_signal_strategy.cc | 2 +- ui/app_list/cocoa/app_list_view_controller.mm | 2 +- .../cocoa/apps_search_results_controller_unittest.mm | 2 +- ui/views/examples/multiline_example.cc | 2 +- 31 files changed, 28 insertions(+), 70 deletions(-) delete mode 100644 base/nullable_string16.h delete mode 100644 base/string16.h delete mode 100644 base/string_number_conversions.h delete mode 100644 base/string_util_posix.h delete mode 100644 base/string_util_win.h delete mode 100644 base/utf_string_conversions.h diff --git a/base/message_loop/message_pump_win.cc b/base/message_loop/message_pump_win.cc index 36a321092ff21c..6d9863a92a73a0 100644 --- a/base/message_loop/message_pump_win.cc +++ b/base/message_loop/message_pump_win.cc @@ -10,7 +10,7 @@ #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h" #include "base/process_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/win/wrapped_window_proc.h" namespace base { diff --git a/base/nullable_string16.h b/base/nullable_string16.h deleted file mode 100644 index 3adae7a4ef1c46..00000000000000 --- a/base/nullable_string16.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file has moved, please use the new location. -// TODO(avi) remove this file when all users have been updated. -#include "base/strings/nullable_string16.h" diff --git a/base/string16.h b/base/string16.h deleted file mode 100644 index 4fea704747f474..00000000000000 --- a/base/string16.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file has moved, please use the new location. -// TODO(avi) remove this file when all users have been updated. -#include "base/strings/string16.h" diff --git a/base/string_number_conversions.h b/base/string_number_conversions.h deleted file mode 100644 index c1ce55c870ccb5..00000000000000 --- a/base/string_number_conversions.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file has moved, please use the new location. -// TODO(brettw) remove this file when all users have been updated. -#include "base/strings/string_number_conversions.h" diff --git a/base/string_util_posix.h b/base/string_util_posix.h deleted file mode 100644 index e82669012c3afe..00000000000000 --- a/base/string_util_posix.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file has moved, please use the new location. -// TODO(avi) remove this file when all users have been updated. -#include "base/strings/string_util_posix.h" diff --git a/base/string_util_win.h b/base/string_util_win.h deleted file mode 100644 index 29bc4aa9eb328e..00000000000000 --- a/base/string_util_win.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file has moved, please use the new location. -// TODO(avi) remove this file when all users have been updated. -#include "base/strings/string_util_win.h" diff --git a/base/strings/nullable_string16.cc b/base/strings/nullable_string16.cc index 740147b092ff13..07f81d43396548 100644 --- a/base/strings/nullable_string16.cc +++ b/base/strings/nullable_string16.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/nullable_string16.h" +#include "base/strings/nullable_string16.h" #include diff --git a/base/utf_string_conversions.h b/base/utf_string_conversions.h deleted file mode 100644 index 284f45cbf3323c..00000000000000 --- a/base/utf_string_conversions.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// TODO(brettw) remove this header once all callers are fixed up. -#include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/chromeos/options/network_connect.cc b/chrome/browser/chromeos/options/network_connect.cc index 8ebe55c2251c48..4daccc21e43da4 100644 --- a/chrome/browser/chromeos/options/network_connect.cc +++ b/chrome/browser/chromeos/options/network_connect.cc @@ -10,7 +10,7 @@ #include "ash/system/chromeos/network/network_observer.h" #include "ash/system/tray/system_tray_notifier.h" #include "base/command_line.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc index 0cfa146900289e..d7c22117ee2a79 100644 --- a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc +++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc @@ -5,7 +5,7 @@ #include "base/files/file_path.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" -#include "base/string16.h" +#include "base/strings/string16.h" #include "chrome/browser/extensions/activity_log/activity_database.h" #include "chrome/browser/extensions/activity_log/api_actions.h" #include "chrome/browser/extensions/activity_log/blocked_actions.h" diff --git a/chrome/browser/extensions/web_view_interactive_browsertest.cc b/chrome/browser/extensions/web_view_interactive_browsertest.cc index 5d854bd94923fd..bcece75dbe4313 100644 --- a/chrome/browser/extensions/web_view_interactive_browsertest.cc +++ b/chrome/browser/extensions/web_view_interactive_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/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/platform_app_browsertest_util.h" diff --git a/chrome/browser/media_galleries/media_galleries_dialog_controller_unittest.cc b/chrome/browser/media_galleries/media_galleries_dialog_controller_unittest.cc index a812bedbfc9a73..890750e4cab3a4 100644 --- a/chrome/browser/media_galleries/media_galleries_dialog_controller_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_dialog_controller_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/files/file_path.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 "chrome/browser/media_galleries/media_galleries_dialog_controller.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h" diff --git a/chrome/browser/notifications/notification_audio_controller.h b/chrome/browser/notifications/notification_audio_controller.h index ce6cbdbb1e34c3..c8a27a756989e5 100644 --- a/chrome/browser/notifications/notification_audio_controller.h +++ b/chrome/browser/notifications/notification_audio_controller.h @@ -10,7 +10,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "media/audio/audio_parameters.h" namespace base { diff --git a/chrome/browser/policy/managed_mode_policy_provider.cc b/chrome/browser/policy/managed_mode_policy_provider.cc index ecd51c9b600b9c..ec6fba6d95b3a5 100644 --- a/chrome/browser/policy/managed_mode_policy_provider.cc +++ b/chrome/browser/policy/managed_mode_policy_provider.cc @@ -7,7 +7,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/prefs/json_pref_store.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/managed_mode/managed_mode_url_filter.h" #include "chrome/browser/policy/policy_bundle.h" diff --git a/chrome/browser/sync_file_system/drive_metadata_store.cc b/chrome/browser/sync_file_system/drive_metadata_store.cc index da343e3f5d0f9e..1a0836bbdb3c77 100644 --- a/chrome/browser/sync_file_system/drive_metadata_store.cc +++ b/chrome/browser/sync_file_system/drive_metadata_store.cc @@ -14,10 +14,9 @@ #include "base/message_loop/message_loop_proxy.h" #include "base/sequenced_task_runner.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/task_runner_util.h" #include "chrome/browser/sync_file_system/drive/metadata_db_migration_util.h" #include "chrome/browser/sync_file_system/drive_file_sync_service.h" diff --git a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm index 7fadb8a847e9a0..2203913f9e5a85 100644 --- a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm @@ -7,7 +7,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/message_loop.h" #include "base/run_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #import "ui/message_center/cocoa/status_item_view.h" #include "ui/message_center/message_center.h" #include "ui/message_center/notification.h" diff --git a/chrome/browser/ui/views/avatar_menu_button_browsertest.cc b/chrome/browser/ui/views/avatar_menu_button_browsertest.cc index bd294f8d904018..611995e3383ad4 100644 --- a/chrome/browser/ui/views/avatar_menu_button_browsertest.cc +++ b/chrome/browser/ui/views/avatar_menu_button_browsertest.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/path_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/avatar_menu_model.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser_list.h" diff --git a/chrome/browser/ui/webui/options/language_options_handler_common.cc b/chrome/browser/ui/webui/options/language_options_handler_common.cc index 55175412a73712..3f54d7c28e884a 100644 --- a/chrome/browser/ui/webui/options/language_options_handler_common.cc +++ b/chrome/browser/ui/webui/options/language_options_handler_common.cc @@ -13,7 +13,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/prefs/pref_service.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc index dab5306b9c872a..da6b08df8151b1 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.cc +++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc @@ -33,7 +33,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_CHROMEOS) -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "chrome/browser/chromeos/net/proxy_config_handler.h" #include "chrome/browser/chromeos/proxy_cros_settings_parser.h" #include "chrome/browser/chromeos/settings/cros_settings.h" diff --git a/components/autofill/content/browser/wallet/form_field_error.cc b/components/autofill/content/browser/wallet/form_field_error.cc index 91ba4f84f7246e..da7ee3131192aa 100644 --- a/components/autofill/content/browser/wallet/form_field_error.cc +++ b/components/autofill/content/browser/wallet/form_field_error.cc @@ -5,8 +5,8 @@ #include "components/autofill/content/browser/wallet/form_field_error.h" #include "base/logging.h" -#include "base/string_util.h" -#include "base/utf_string_conversions.h" +#include "base/strings/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" namespace autofill { diff --git a/content/browser/accessibility/accessibility_tree_formatter_android.cc b/content/browser/accessibility/accessibility_tree_formatter_android.cc index a5d6a33aa22c8e..cc1a852ed062e9 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_android.cc +++ b/content/browser/accessibility/accessibility_tree_formatter_android.cc @@ -10,9 +10,9 @@ #include "base/android/jni_string.h" #include "base/files/file_path.h" #include "base/json/json_writer.h" -#include "base/string_util.h" -#include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "content/browser/accessibility/browser_accessibility_android.h" #include "content/common/accessibility_node_data.h" diff --git a/content/browser/accessibility/browser_accessibility_android.cc b/content/browser/accessibility/browser_accessibility_android.cc index 511d67efaccd37..2f1ab2daa4b2ff 100644 --- a/content/browser/accessibility/browser_accessibility_android.cc +++ b/content/browser/accessibility/browser_accessibility_android.cc @@ -8,7 +8,7 @@ #include "base/android/jni_registrar.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/browser/accessibility/browser_accessibility_manager_android.h" #include "content/common/accessibility_messages.h" #include "content/common/accessibility_node_data.h" diff --git a/content/browser/accessibility/browser_accessibility_manager_android.cc b/content/browser/accessibility/browser_accessibility_manager_android.cc index 5b57b482caaf98..861375cb14bfec 100644 --- a/content/browser/accessibility/browser_accessibility_manager_android.cc +++ b/content/browser/accessibility/browser_accessibility_manager_android.cc @@ -9,7 +9,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "content/browser/accessibility/browser_accessibility_android.h" #include "content/common/accessibility_messages.h" diff --git a/content/test/accessibility_browser_test_utils.cc b/content/test/accessibility_browser_test_utils.cc index 656ad83e569b19..5ca6b12ef77b6e 100644 --- a/content/test/accessibility_browser_test_utils.cc +++ b/content/test/accessibility_browser_test_utils.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/port/browser/render_widget_host_view_port.h" diff --git a/dbus/bus.cc b/dbus/bus.cc index dd9ed342462d53..d4e3abbe07fb82 100644 --- a/dbus/bus.cc +++ b/dbus/bus.cc @@ -9,7 +9,7 @@ #include "base/message_loop.h" #include "base/message_loop/message_loop_proxy.h" #include "base/stl_util.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "base/time.h" diff --git a/media/base/audio_buffer_unittest.cc b/media/base/audio_buffer_unittest.cc index 8250ed576188b9..286953e7794668 100644 --- a/media/base/audio_buffer_unittest.cc +++ b/media/base/audio_buffer_unittest.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/stringprintf.h" #include "media/base/audio_buffer.h" #include "media/base/audio_bus.h" diff --git a/net/http/http_response_headers.h b/net/http/http_response_headers.h index 937892fc0af850..6107597953568a 100644 --- a/net/http/http_response_headers.h +++ b/net/http/http_response_headers.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" -#include "base/string_piece.h" +#include "base/strings/string_piece.h" #include "net/base/net_export.h" #include "net/base/net_log.h" #include "net/http/http_version.h" diff --git a/remoting/client/plugin/pepper_signal_strategy.cc b/remoting/client/plugin/pepper_signal_strategy.cc index 4cf03304e701a6..3e8f675e601bd3 100644 --- a/remoting/client/plugin/pepper_signal_strategy.cc +++ b/remoting/client/plugin/pepper_signal_strategy.cc @@ -4,7 +4,7 @@ #include "remoting/client/plugin/pepper_signal_strategy.h" -#include "base/string_number_conversions.h" +#include "base/strings/string_number_conversions.h" #include "third_party/libjingle/source/talk/xmllite/xmlelement.h" namespace remoting { diff --git a/ui/app_list/cocoa/app_list_view_controller.mm b/ui/app_list/cocoa/app_list_view_controller.mm index 50713e9307ed9a..330c80d6495c1f 100644 --- a/ui/app_list/cocoa/app_list_view_controller.mm +++ b/ui/app_list/cocoa/app_list_view_controller.mm @@ -5,7 +5,7 @@ #import "ui/app_list/cocoa/app_list_view_controller.h" #include "base/mac/foundation_util.h" -#include "base/string_util.h" +#include "base/strings/string_util.h" #include "skia/ext/skia_utils_mac.h" #include "ui/app_list/app_list_constants.h" #include "ui/app_list/app_list_model.h" diff --git a/ui/app_list/cocoa/apps_search_results_controller_unittest.mm b/ui/app_list/cocoa/apps_search_results_controller_unittest.mm index 757c68f4fc1ece..e93fb1f3b484a9 100644 --- a/ui/app_list/cocoa/apps_search_results_controller_unittest.mm +++ b/ui/app_list/cocoa/apps_search_results_controller_unittest.mm @@ -5,7 +5,7 @@ #import "ui/app_list/cocoa/apps_search_results_controller.h" #include "base/memory/scoped_nsobject.h" -#include "base/stringprintf.h" +#include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #import "testing/gtest_mac.h" diff --git a/ui/views/examples/multiline_example.cc b/ui/views/examples/multiline_example.cc index b06000eabe1d9e..04fdde7c96b916 100644 --- a/ui/views/examples/multiline_example.cc +++ b/ui/views/examples/multiline_example.cc @@ -4,7 +4,7 @@ #include "ui/views/examples/multiline_example.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/base/events/event.h" #include "ui/gfx/render_text.h" #include "ui/views/controls/label.h"