Use a direct include of strings headers in chrome_frame/.

BUG=247723
TEST=none
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/16391006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205413 0039d316-1c4b-4281-b951-d872f2087c98

chrome_frame/bho.cc

@@ -9,8 +9,8 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/time.h"
 #include "base/win/scoped_bstr.h"
 #include "chrome_frame/buggy_bho_handling.h"

chrome_frame/bind_status_callback_impl.cc

@@ -5,8 +5,8 @@
 #include "chrome_frame/bind_status_callback_impl.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/threading/platform_thread.h"
 
 BSCBImpl::BSCBImpl() {

chrome_frame/chrome_active_document.cc

@@ -20,7 +20,7 @@
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_variant.h"
 #include "chrome/app/chrome_command_ids.h"

chrome_frame/chrome_frame_activex.cc

@@ -16,9 +16,9 @@
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_variant.h"

chrome_frame/chrome_frame_activex_base.h

@@ -18,8 +18,8 @@
 #include <vector>
 
 #include "base/metrics/histogram.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"

chrome_frame/chrome_frame_automation.cc

@@ -15,7 +15,7 @@
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"

chrome_frame/chrome_launcher_utils.cc

@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"

chrome_frame/chrome_tab.cc

@@ -18,10 +18,10 @@
 #include "base/logging.h"
 #include "base/logging_win.h"
 #include "base/path_service.h"
-#include "base/string16.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string16.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"

chrome_frame/com_message_event.cc

@@ -5,8 +5,8 @@
 #include "chrome_frame/com_message_event.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/utf_string_conversions.h"
 
 ComMessageEvent::ComMessageEvent() {

chrome_frame/crash_reporting/nt_loader_unittest.cc

@@ -13,7 +13,7 @@
 #include "base/environment.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/threading/thread.h"

chrome_frame/dll_redirector.cc

@@ -14,7 +14,7 @@
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/shared_memory.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/version.h"
 #include "base/win/windows_version.h"

chrome_frame/find_dialog.h

@@ -9,7 +9,7 @@
 #include <atlwin.h>
 
 #include "base/memory/ref_counted.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "resource.h"
 #include "grit/chrome_frame_dialogs.h"
 

chrome_frame/html_utils.cc

@@ -7,9 +7,9 @@
 #include <atlbase.h>
 #include <urlmon.h>
 
-#include "base/string_util.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_tokenizer.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome_frame/utils.h"
 #include "net/base/net_util.h"

chrome_frame/http_negotiate.cc

@@ -10,8 +10,8 @@
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome_frame/bho.h"
 #include "chrome_frame/exception_barrier.h"

chrome_frame/metrics_service.cc

@@ -45,10 +45,10 @@
 #include <windows.h>
 
 #include "base/metrics/statistics_recorder.h"
-#include "base/string16.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string16.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/synchronization/lock.h"
 #include "base/win/scoped_comptr.h"

chrome_frame/navigation_constraints.cc

@@ -4,7 +4,7 @@
 
 #include "chrome_frame/navigation_constraints.h"
 
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/url_constants.h"
 #include "chrome_frame/utils.h"

chrome_frame/policy_settings.cc

@@ -7,7 +7,7 @@
 #include <algorithm>
 
 #include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "chrome_frame/utils.h"

chrome_frame/protocol_sink_wrap.cc

@@ -9,9 +9,9 @@
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
-#include "base/string_number_conversions.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/win/scoped_bstr.h"
 #include "chrome_frame/bho.h"

chrome_frame/ready_mode/internal/registry_ready_mode_state.cc

@@ -8,8 +8,8 @@
 
 #include "base/logging.h"
 #include "base/process_util.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/time.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"

chrome_frame/registry_list_preferences_holder.cc

@@ -4,7 +4,7 @@
 
 #include "chrome_frame/registry_list_preferences_holder.h"
 
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/win/registry.h"
 
 RegistryListPreferencesHolder::RegistryListPreferencesHolder() : valid_(false) {

chrome_frame/registry_list_preferences_holder.h

@@ -14,7 +14,7 @@
 
 #include <vector>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 class RegistryListPreferencesHolder {
  public:

chrome_frame/simple_resource_loader.cc

@@ -14,7 +14,7 @@
 #include "base/i18n/rtl.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/i18n.h"
 #include "base/win/windows_version.h"

chrome_frame/test/automation_client_mock.h

@@ -8,7 +8,7 @@
 #include <windows.h>
 #include <string>
 
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "chrome_frame/chrome_frame_automation.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/proxy_factory_mock.h"

chrome_frame/test/chrome_frame_test_utils.cc

@@ -19,10 +19,10 @@
 #include "base/path_service.h"
 #include "base/process.h"
 #include "base/process_util.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"

chrome_frame/test/chrome_frame_ui_test_utils.cc

@@ -13,8 +13,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_bstr.h"
 #include "chrome/common/chrome_paths.h"

chrome_frame/test/dll_redirector_loading_test.cc

@@ -13,7 +13,7 @@
 #include "base/path_service.h"
 #include "base/scoped_native_library.h"
 #include "base/shared_memory.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/version.h"
 #include "base/win/scoped_comptr.h"
 #include "chrome/installer/test/alternate_version_generator.h"

chrome_frame/test/http_negotiate_unittest.cc

@@ -5,8 +5,8 @@
 #include <atlbase.h>
 #include <atlcom.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 "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"

chrome_frame/test/ie_configurator.cc

@@ -13,7 +13,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/time.h"
 #include "base/win/registry.h"
 #include "chrome_frame/chrome_tab.h"

chrome_frame/test/ie_event_sink.cc

@@ -11,10 +11,10 @@
 #include <utility>
 
 #include "base/lazy_instance.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "base/time.h"

chrome_frame/test/infobar_unittests.cc

@@ -10,15 +10,15 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/string_number_conversions.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "testing/gmock/include/gmock/gmock.h"
+#include "base/strings/string_number_conversions.h"
 #include "chrome_frame/infobars/infobar_content.h"
 #include "chrome_frame/infobars/internal/displaced_window_manager.h"
 #include "chrome_frame/infobars/internal/host_window_manager.h"
 #include "chrome_frame/infobars/internal/infobar_window.h"
 #include "chrome_frame/infobars/internal/subclassing_window_with_delegate.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 

chrome_frame/test/mock_ie_event_sink_actions.h

@@ -11,8 +11,8 @@
 
 #include "base/basictypes.h"
 #include "base/bind.h"
-#include "base/string_util.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
+#include "base/strings/string_util.h"
 #include "base/test/test_process_killer_win.h"
 #include "base/threading/platform_thread.h"
 #include "base/time.h"

chrome_frame/test/mock_ie_event_sink_test.h

@@ -11,8 +11,8 @@
 #include <vector>
 
 #include "base/files/file_path.h"
-#include "base/string_number_conversions.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/win/object_watcher.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"

chrome_frame/test/net/fake_external_tab.cc

@@ -22,9 +22,9 @@
 #include "base/prefs/json_pref_store.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"

chrome_frame/test/perf/chrome_frame_perftest.cc

@@ -16,8 +16,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_file_util.h"
 #include "base/threading/platform_thread.h"

chrome_frame/test/policy_settings_unittest.cc

@@ -6,7 +6,7 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "chrome_frame/policy_settings.h"

chrome_frame/test/reliability/page_load_test.cc

@@ -33,8 +33,8 @@
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_value_store.h"
-#include "base/string_number_conversions.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/test/test_file_util.h"
 #include "base/time.h"

chrome_frame/test/test_scrubber.cc

@@ -16,7 +16,7 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/process_util.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_process_killer_win.h"
 #include "base/win/registry.h"

chrome_frame/test/test_server.cc

@@ -10,10 +10,10 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "net/base/winsock_init.h"

chrome_frame/test/test_server_test.cc

@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/path_service.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/win/scoped_handle.h"
 #include "chrome_frame/test/test_server.h"
 #include "net/cookies/cookie_monster.h"

chrome_frame/test/test_with_web_server.cc

@@ -10,7 +10,7 @@
 #include "base/files/memory_mapped_file.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_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 "base/win/windows_version.h"

chrome_frame/test/test_with_web_server.h

@@ -9,8 +9,8 @@
 #include <string>
 
 #include "base/files/scoped_temp_dir.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_handle.h"
 #include "chrome_frame/chrome_tab.h"

chrome_frame/test/util_unittests.cc

@@ -5,7 +5,7 @@
 #include "base/file_version_info.h"
 #include "base/file_version_info_win.h"
 #include "base/files/file_path.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "chrome_frame/navigation_constraints.h"

chrome_frame/test/win_event_receiver.cc

@@ -8,8 +8,8 @@
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
+#include "base/strings/string_util.h"
 #include "base/win/object_watcher.h"
-#include "base/string_util.h"
 #include "chrome_frame/function_stub.h"
 
 // WinEventReceiver methods

chrome_frame/test_utils.cc

@@ -16,7 +16,7 @@
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_handle.h"
 #include "chrome/common/chrome_paths.h"

chrome_frame/test_utils.h

@@ -10,7 +10,7 @@
 #include <atlbase.h>
 #include <atlcom.h>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace base {
 class FilePath;

chrome_frame/urlmon_bind_status_callback.cc

@@ -8,8 +8,8 @@
 #include <shlguid.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/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "chrome_frame/bind_context_info.h"

chrome_frame/urlmon_moniker.cc

@@ -7,8 +7,8 @@
 #include <exdisp.h>
 #include <shlguid.h>
 
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome_frame/bho.h"
 #include "chrome_frame/bind_context_info.h"

chrome_frame/urlmon_url_request.cc

@@ -12,8 +12,8 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/string_number_conversions.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/threading/platform_thread.h"
 #include "base/threading/thread.h"

chrome_frame/utils.cc

@@ -14,11 +14,11 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_tokenizer.h"
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_local.h"
 #include "base/win/registry.h"

chrome_frame/utils.h

@@ -15,7 +15,7 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/win/scoped_comptr.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/rect.h"