Use a direct include of strings headers, delete some strings forwarding headers.

Use a direct include of strings headers, delete some strings forwarding headers.

BUG=247723
TEST=everything compiles OK
TBR=ben@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=207507

[Avi (use Gerrit), 2013-06-20 19:43:05]

Committed patchset #3 manually as r207507 (presubmit successful).

[Ben Goodger (Google), 2013-06-21 02:22:47]

lgtm


On Thu, Jun 20, 2013 at 12:43 PM, <avi@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Message:
> Committed patchset #3 manually as r207507 (presubmit successful).
>
> Description:
> Use a direct include of strings headers, delete some strings forwarding
> headers.
>
> BUG=247723
> TEST=everything compiles OK
> TBR=ben@chromium.org
>
> Committed: https://src.chromium.org/**viewvc/chrome?view=rev&**
>
revision=207507<https://src.chromium.org/viewvc/chrome?view=rev&revision=207507>
>
> Please review this at
https://codereview.chromium.**org/17390010/<https://codereview.chromium.org/1...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M base/message_loop/message_**pump_win.cc
>   D base/nullable_string16.h
>   D base/string16.h
>   D base/string_number_**conversions.h
>   D base/string_util_posix.h
>   D base/string_util_win.h
>   M base/strings/nullable_**string16.cc
>   D base/utf_string_conversions.h
>   M chrome/browser/chromeos/**options/network_connect.cc
>   M chrome/browser/extensions/**activity_log/fullstream_ui_**policy.cc
>   M chrome/browser/extensions/web_**view_interactive_browsertest.**cc
>   M chrome/browser/media_**galleries/media_galleries_**
> dialog_controller_unittest.cc
>   M chrome/browser/notifications/**notification_audio_controller.**h
>   M chrome/browser/policy/managed_**mode_policy_provider.cc
>   M chrome/browser/sync_file_**system/drive_metadata_store.cc
>   M chrome/browser/ui/cocoa/**notifications/message_center_**
> tray_bridge_unittest.mm <http://message_center_tray_bridge_unittest.mm>
>   M chrome/browser/ui/views/**avatar_menu_button_**browsertest.cc
>   M chrome/browser/ui/webui/**options/language_options_**handler_common.cc
>   M chrome/browser/ui/webui/**options/preferences_**browsertest.cc
>   M components/autofill/content/**browser/wallet/form_field_**error.cc
>   M content/browser/accessibility/**accessibility_tree_formatter_**
> android.cc
>   M content/browser/accessibility/**browser_accessibility_android.**cc
>   M content/browser/accessibility/**browser_accessibility_manager_**
> android.cc
>   M content/test/accessibility_**browser_test_utils.cc
>   M dbus/bus.cc
>   M media/base/audio_buffer_**unittest.cc
>   M net/http/http_response_**headers.h
>   M remoting/client/plugin/pepper_**signal_strategy.cc
>   M
ui/app_list/cocoa/app_list_**view_controller.mm<http://app_list_view_controller.mm>
>   M
ui/app_list/cocoa/apps_search_**results_controller_unittest.mm<http://apps_search_results_controller_unittest.mm>
>   M ui/views/examples/multiline_**example.cc
>
>
> Index: base/nullable_string16.h
> diff --git a/base/nullable_string16.h b/base/nullable_string16.h
> deleted file mode 100644
> index 3adae7a4ef1c46cfd7c8519e904fd9**92c61c778d..**
> 000000000000000000000000000000**0000000000
> --- 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"
> Index: base/string16.h
> diff --git a/base/string16.h b/base/string16.h
> deleted file mode 100644
> index 4fea704747f474f94a1bcc041b9950**17008fad4d..**
> 000000000000000000000000000000**0000000000
> --- 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"
> Index: base/string_number_**conversions.h
> diff --git a/base/string_number_**conversions.h b/base/string_number_**
> conversions.h
> deleted file mode 100644
> index c1ce55c870ccb55388d8122d8769a3**25b52d73cc..**
> 000000000000000000000000000000**0000000000
> --- 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"
> Index: base/string_util_posix.h
> diff --git a/base/string_util_posix.h b/base/string_util_posix.h
> deleted file mode 100644
> index e82669012c3afeaef13318755ce8f9**ce04398f47..**
> 000000000000000000000000000000**0000000000
> --- 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"
> Index: base/string_util_win.h
> diff --git a/base/string_util_win.h b/base/string_util_win.h
> deleted file mode 100644
> index 29bc4aa9eb328e67a8844bccec36f2**98e823b913..**
> 000000000000000000000000000000**0000000000
> --- 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"
> Index: base/utf_string_conversions.h
> diff --git a/base/utf_string_conversions.**h
> b/base/utf_string_conversions.**h
> deleted file mode 100644
> index 284f45cbf3323c699f670837805c80**c80ff3650a..**
> 000000000000000000000000000000**0000000000
> --- 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"
> Index: base/message_loop/message_**pump_win.cc
> diff --git a/base/message_loop/message_**pump_win.cc
> b/base/message_loop/message_**pump_win.cc
> index 36a321092ff21c2f6be12d7fd36f26**53e5ddd025..**
> 6d9863a92a73a0cf6fae47b3840131**c222cb2b31 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 {
> Index: base/strings/nullable_**string16.cc
> diff --git a/base/strings/nullable_**string16.cc b/base/strings/nullable_*
> *string16.cc
> index 740147b092ff13ec258cc39787041d**3099b35cab..**
> 07f81d43396548e87f8972ed307197**2f6848cae0 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 <ostream>
>
> Index: chrome/browser/chromeos/**options/network_connect.cc
> diff --git a/chrome/browser/chromeos/**options/network_connect.cc
> b/chrome/browser/chromeos/**options/network_connect.cc
> index 8ebe55c2251c48ca083796eca93831**93dbb139eb..**
> 4daccc21e43da426c43727db4a9fab**a969287f4a 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"
> Index: chrome/browser/extensions/**activity_log/fullstream_ui_**policy.cc
> diff --git
a/chrome/browser/extensions/**activity_log/fullstream_ui_**policy.cc
> b/chrome/browser/extensions/**activity_log/fullstream_ui_**policy.cc
> index 0cfa146900289ef8519ba79f07ab59**a6c10518ed..**
> d7c22117ee2a79a4b61d6f94c0caef**7b9c81018c 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"
> Index: chrome/browser/extensions/web_**view_interactive_browsertest.**cc
> diff --git
a/chrome/browser/extensions/**web_view_interactive_**browsertest.cc
> b/chrome/browser/extensions/**web_view_interactive_**browsertest.cc
> index 5d854bd94923fd5e9bf1fa292db2e8**470a49bf20..**
> bcece75dbe43132aec5ab21b48ba95**e92604cf7b 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"
> Index: chrome/browser/media_**galleries/media_galleries_**
> dialog_controller_unittest.cc
> 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 a812bedbfc9a737df23fcda4c94ca8**e3be74c87e..**
> 890750e4cab3a4f9f902d7d6a679eb**e092c0a9c9 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"
> Index: chrome/browser/notifications/**notification_audio_controller.**h
> diff --git a/chrome/browser/**notifications/notification_**audio_controller.h
> b/chrome/browser/**notifications/notification_**audio_controller.h
> index ce6cbdbb1e34c3069486ea4d60eeb0**a93558f718..**
> c8a27a756989e557f4a825f089607e**088d7130f5 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 {
> Index: chrome/browser/policy/managed_**mode_policy_provider.cc
> diff --git a/chrome/browser/policy/**managed_mode_policy_provider.**cc
> b/chrome/browser/policy/**managed_mode_policy_provider.**cc
> index ecd51c9b600b9c0e6e6c7d0db3796b**9f6bff8dc0..**
> ec6fba6d95b3a5aadf979a0af4832e**86083f4c0a 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"
> Index: chrome/browser/sync_file_**system/drive_metadata_store.cc
> diff --git a/chrome/browser/sync_file_**system/drive_metadata_store.cc
> b/chrome/browser/sync_file_**system/drive_metadata_store.cc
> index da343e3f5d0f9e196d4836ad8fee8e**01b87bb4ce..**
> 1a0836bbdb3c7720b3feb112f0a3cf**dbb97d07a1 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"
> Index: chrome/browser/ui/cocoa/**notifications/message_center_**
> tray_bridge_unittest.mm <http://message_center_tray_bridge_unittest.mm>
> diff --git a/chrome/browser/ui/cocoa/**notifications/message_center_**
> tray_bridge_unittest.mm
<http://message_center_tray_bridge_unittest.mm>b/chrome/browser/ui/cocoa/
>
**notifications/message_center_**tray_bridge_unittest.mm<http://message_center_tray_bridge_unittest.mm>
> index 7fadb8a847e9a09dff24c8d6a4a95f**4099973f6b..**
> 2203913f9e5a850a75a1363b1ae8b6**66d9afdccf 100644
> --- a/chrome/browser/ui/cocoa/**notifications/message_center_**
> tray_bridge_unittest.mm <http://message_center_tray_bridge_unittest.mm>
> +++ b/chrome/browser/ui/cocoa/**notifications/message_center_**
> tray_bridge_unittest.mm <http://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"
> Index: chrome/browser/ui/views/**avatar_menu_button_**browsertest.cc
> diff --git a/chrome/browser/ui/views/**avatar_menu_button_**browsertest.cc
> b/chrome/browser/ui/views/**avatar_menu_button_**browsertest.cc
> index bd294f8d9040182faa77196fc633d7**78d4855bd8..**
> 611995e3383ad4be4f23254a6af675**20bbf8f509 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"
> Index: chrome/browser/ui/webui/**options/language_options_**
> handler_common.cc
> 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 55175412a737129c7a1a943005aeef**9b69b1de3b..**
> 3f54d7c28e884ae03f67ad513f8052**4e75a12eb4 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"
> Index: chrome/browser/ui/webui/**options/preferences_**browsertest.cc
> diff --git a/chrome/browser/ui/webui/**options/preferences_**browsertest.cc
> b/chrome/browser/ui/webui/**options/preferences_**browsertest.cc
> index dab5306b9c872a5cdcc72e1cd95d15**118d334c5b..**
> da6b08df8151b1acacafd2943ae452**9a5f003b9c 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"
> Index: components/autofill/content/**browser/wallet/form_field_**error.cc
> diff --git
a/components/autofill/content/**browser/wallet/form_field_**error.cc
> b/components/autofill/content/**browser/wallet/form_field_**error.cc
> index 91ba4f84f7246e2c8d5b3fa10c30f9**776c1e1a4e..**
> da7ee3131192aa325d49027c72a743**12ba5c40cf 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 {
> Index: content/browser/accessibility/**accessibility_tree_formatter_**
> android.cc
> diff --git
a/content/browser/**accessibility/accessibility_**tree_formatter_android.cc
> b/content/browser/**accessibility/accessibility_**
> tree_formatter_android.cc
> index a5d6a33aa22c8e0a8b98131a93d0b7**e4909ad037..**
> cc1a852ed062e95d47aa790e28303c**813d2a7dca 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"
>
> Index: content/browser/accessibility/**browser_accessibility_android.**cc
> diff --git
a/content/browser/**accessibility/browser_**accessibility_android.cc
> b/content/browser/**accessibility/browser_**accessibility_android.cc
> index 511d67efaccd37662040888f003123**3bd74204c2..**
> 2f1ab2daa4b2ffe554e38c9cb78401**a09eaf8240 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"
> Index: content/browser/accessibility/**browser_accessibility_manager_**
> android.cc
> diff --git a/content/browser/**accessibility/browser_**
> accessibility_manager_android.**cc b/content/browser/**
> accessibility/browser_**accessibility_manager_android.**cc
> index 5b57b482caaf98ad26b5f4a27dc1d4**af1d2b1435..**
> 861375cb14bfec79e98ecf05c18e7e**e6c36857c3 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"
> Index: content/test/accessibility_**browser_test_utils.cc
> diff --git a/content/test/accessibility_**browser_test_utils.cc
> b/content/test/accessibility_**browser_test_utils.cc
> index 656ad83e569b1990281c0c4d00ee37**a3d761279e..**
> 5ca6b12ef77b6e8608662d935b066c**35d6e52183 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"
> Index: dbus/bus.cc
> diff --git a/dbus/bus.cc b/dbus/bus.cc
> index dd9ed342462d53df59bb924b4f7d83**194797a38d..**
> d4e3abbe07fb82555e9d5d8822ded4**3db7e4e45a 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"
> Index: media/base/audio_buffer_**unittest.cc
> diff --git a/media/base/audio_buffer_**unittest.cc
> b/media/base/audio_buffer_**unittest.cc
> index 8250ed576188b9332e4b70925d737b**222e0443aa..**
> 286953e77946687635e5ea3775e25f**dc2fd40594 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"
> Index: net/http/http_response_**headers.h
> diff --git a/net/http/http_response_**headers.h b/net/http/http_response_*
> *headers.h
> index 937892fc0af85055cfa5af572f0d48**f2a4ccd5fc..**
> 6107597953568a3ec79bb66d68d473**727842a0ac 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"
> Index: remoting/client/plugin/pepper_**signal_strategy.cc
> diff --git a/remoting/client/plugin/**pepper_signal_strategy.cc
> b/remoting/client/plugin/**pepper_signal_strategy.cc
> index 4cf03304e701a64e13def5bc101c7c**905b45b427..**
> 3e8f675e601bd32eeba94e30b84c19**c0c6565ddd 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 {
> Index:
ui/app_list/cocoa/app_list_**view_controller.mm<http://app_list_view_controller.mm>
> diff --git
a/ui/app_list/cocoa/app_list_**view_controller.mm<http://app_list_view_controller.mm>b/ui/app_list/cocoa/
> app_list_**view_controller.mm <http://app_list_view_controller.mm>
> index 50713e9307ed9a81b4037d0c5c0242**7643192322..**
> 330c80d6495c1fe10eeebf7542950b**7ec4b439c2 100644
> ---
a/ui/app_list/cocoa/app_list_**view_controller.mm<http://app_list_view_controller.mm>
> +++
b/ui/app_list/cocoa/app_list_**view_controller.mm<http://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"
> Index:
ui/app_list/cocoa/apps_search_**results_controller_unittest.mm<http://apps_search_results_controller_unittest.mm>
> diff --git a/ui/app_list/cocoa/apps_**search_results_controller_**
> unittest.mm
<http://apps_search_results_controller_unittest.mm>b/ui/app_list/cocoa/
>
apps_**search_results_controller_**unittest.mm<http://apps_search_results_controller_unittest.mm>
> index 757c68f4fc1ecebb36fed3a70b844e**863db885b6..**
> e93fb1f3b484a9099a7b7e3e0f22cc**23b98c6a7e 100644
> ---
a/ui/app_list/cocoa/apps_**search_results_controller_**unittest.mm<http://apps_search_results_controller_unittest.mm>
> +++
b/ui/app_list/cocoa/apps_**search_results_controller_**unittest.mm<http://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"
> Index: ui/views/examples/multiline_**example.cc
> diff --git a/ui/views/examples/multiline_**example.cc
> b/ui/views/examples/multiline_**example.cc
> index b06000eabe1d9ee05075ee03a81b40**be295448c0..**
> 04fdde7c96b916cdfae5c174ff0abe**07210bb0dd 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"
>
>
>