diff options
50 files changed, 85 insertions, 85 deletions
diff --git a/chrome_frame/bho.cc b/chrome_frame/bho.cc index f3e32e0..f977bc3 100644 --- a/chrome_frame/bho.cc +++ b/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" diff --git a/chrome_frame/bind_status_callback_impl.cc b/chrome_frame/bind_status_callback_impl.cc index 4a3c588..427fc7a 100644 --- a/chrome_frame/bind_status_callback_impl.cc +++ b/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() { diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index af2b95e..6c16f13 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/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" diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc index c8c2019..59212c3 100644 --- a/chrome_frame/chrome_frame_activex.cc +++ b/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" diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h index 42d3e99..b1dcc9f 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/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" diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 37e0962..4735e64 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/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" diff --git a/chrome_frame/chrome_launcher_utils.cc b/chrome_frame/chrome_launcher_utils.cc index 3fde2bf..b120a94 100644 --- a/chrome_frame/chrome_launcher_utils.cc +++ b/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" diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc index 90fc8b8..a0af6e3 100644 --- a/chrome_frame/chrome_tab.cc +++ b/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" diff --git a/chrome_frame/com_message_event.cc b/chrome_frame/com_message_event.cc index 506359d..747bfa3 100644 --- a/chrome_frame/com_message_event.cc +++ b/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() { diff --git a/chrome_frame/crash_reporting/nt_loader_unittest.cc b/chrome_frame/crash_reporting/nt_loader_unittest.cc index 14b72d9..05d0968 100644 --- a/chrome_frame/crash_reporting/nt_loader_unittest.cc +++ b/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" diff --git a/chrome_frame/dll_redirector.cc b/chrome_frame/dll_redirector.cc index 7320124..6d094e4 100644 --- a/chrome_frame/dll_redirector.cc +++ b/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" diff --git a/chrome_frame/find_dialog.h b/chrome_frame/find_dialog.h index f7ccaba..4adcdf0 100644 --- a/chrome_frame/find_dialog.h +++ b/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" diff --git a/chrome_frame/html_utils.cc b/chrome_frame/html_utils.cc index 3f816b9..6a6bbea 100644 --- a/chrome_frame/html_utils.cc +++ b/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" diff --git a/chrome_frame/http_negotiate.cc b/chrome_frame/http_negotiate.cc index 1d33c6c..9624694 100644 --- a/chrome_frame/http_negotiate.cc +++ b/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" diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc index ef86e20..ace75ed 100644 --- a/chrome_frame/metrics_service.cc +++ b/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" diff --git a/chrome_frame/navigation_constraints.cc b/chrome_frame/navigation_constraints.cc index 6f0ccf3..33f4216 100644 --- a/chrome_frame/navigation_constraints.cc +++ b/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" diff --git a/chrome_frame/policy_settings.cc b/chrome_frame/policy_settings.cc index e7374fb7..16faec1 100644 --- a/chrome_frame/policy_settings.cc +++ b/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" diff --git a/chrome_frame/protocol_sink_wrap.cc b/chrome_frame/protocol_sink_wrap.cc index 82add57..93bf4d7c 100644 --- a/chrome_frame/protocol_sink_wrap.cc +++ b/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" diff --git a/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc b/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc index 15711ea..3832443 100644 --- a/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc +++ b/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" diff --git a/chrome_frame/registry_list_preferences_holder.cc b/chrome_frame/registry_list_preferences_holder.cc index 581aed6..c540323 100644 --- a/chrome_frame/registry_list_preferences_holder.cc +++ b/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) { diff --git a/chrome_frame/registry_list_preferences_holder.h b/chrome_frame/registry_list_preferences_holder.h index e85f9b7..c57c462 100644 --- a/chrome_frame/registry_list_preferences_holder.h +++ b/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: diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc index 8375870..187e0b7 100644 --- a/chrome_frame/simple_resource_loader.cc +++ b/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" diff --git a/chrome_frame/test/automation_client_mock.h b/chrome_frame/test/automation_client_mock.h index 370b894..a2660b7 100644 --- a/chrome_frame/test/automation_client_mock.h +++ b/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" diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index 7554440..40f4c1a 100644 --- a/chrome_frame/test/chrome_frame_test_utils.cc +++ b/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" diff --git a/chrome_frame/test/chrome_frame_ui_test_utils.cc b/chrome_frame/test/chrome_frame_ui_test_utils.cc index 1192b25..8b0d687 100644 --- a/chrome_frame/test/chrome_frame_ui_test_utils.cc +++ b/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" diff --git a/chrome_frame/test/dll_redirector_loading_test.cc b/chrome_frame/test/dll_redirector_loading_test.cc index 3da41cd..b0c5760 100644 --- a/chrome_frame/test/dll_redirector_loading_test.cc +++ b/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" diff --git a/chrome_frame/test/http_negotiate_unittest.cc b/chrome_frame/test/http_negotiate_unittest.cc index ce55226..a21e4e8 100644 --- a/chrome_frame/test/http_negotiate_unittest.cc +++ b/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" diff --git a/chrome_frame/test/ie_configurator.cc b/chrome_frame/test/ie_configurator.cc index 43d7378..5b7a7e9 100644 --- a/chrome_frame/test/ie_configurator.cc +++ b/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" diff --git a/chrome_frame/test/ie_event_sink.cc b/chrome_frame/test/ie_event_sink.cc index 4a4ec80..182cd4b 100644 --- a/chrome_frame/test/ie_event_sink.cc +++ b/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" diff --git a/chrome_frame/test/infobar_unittests.cc b/chrome_frame/test/infobar_unittests.cc index 18f597a..c5023ff 100644 --- a/chrome_frame/test/infobar_unittests.cc +++ b/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 { diff --git a/chrome_frame/test/mock_ie_event_sink_actions.h b/chrome_frame/test/mock_ie_event_sink_actions.h index 5c4dcab..5fdbf0f 100644 --- a/chrome_frame/test/mock_ie_event_sink_actions.h +++ b/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" diff --git a/chrome_frame/test/mock_ie_event_sink_test.h b/chrome_frame/test/mock_ie_event_sink_test.h index 6232918..262597e 100644 --- a/chrome_frame/test/mock_ie_event_sink_test.h +++ b/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" diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 012805d..e688b50 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/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" diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc index ef0461f..401eae2 100644 --- a/chrome_frame/test/perf/chrome_frame_perftest.cc +++ b/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" diff --git a/chrome_frame/test/policy_settings_unittest.cc b/chrome_frame/test/policy_settings_unittest.cc index 722466e..c5062bd 100644 --- a/chrome_frame/test/policy_settings_unittest.cc +++ b/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" diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index 855a069..82af2ad 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/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" diff --git a/chrome_frame/test/test_scrubber.cc b/chrome_frame/test/test_scrubber.cc index 6aec2e8..4bf6014 100644 --- a/chrome_frame/test/test_scrubber.cc +++ b/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" diff --git a/chrome_frame/test/test_server.cc b/chrome_frame/test/test_server.cc index 5444615..5162b40 100644 --- a/chrome_frame/test/test_server.cc +++ b/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" diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc index 783149b..74c8c97 100644 --- a/chrome_frame/test/test_server_test.cc +++ b/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" diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index 59786b2..38e8709 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/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" diff --git a/chrome_frame/test/test_with_web_server.h b/chrome_frame/test/test_with_web_server.h index 77e7828..d900e73 100644 --- a/chrome_frame/test/test_with_web_server.h +++ b/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" diff --git a/chrome_frame/test/util_unittests.cc b/chrome_frame/test/util_unittests.cc index 22299ac..e6dbd65 100644 --- a/chrome_frame/test/util_unittests.cc +++ b/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" diff --git a/chrome_frame/test/win_event_receiver.cc b/chrome_frame/test/win_event_receiver.cc index adb7d82..b9bdf8d 100644 --- a/chrome_frame/test/win_event_receiver.cc +++ b/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 diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc index f191720..0b99896 100644 --- a/chrome_frame/test_utils.cc +++ b/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" diff --git a/chrome_frame/test_utils.h b/chrome_frame/test_utils.h index b598e69..804f069 100644 --- a/chrome_frame/test_utils.h +++ b/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; diff --git a/chrome_frame/urlmon_bind_status_callback.cc b/chrome_frame/urlmon_bind_status_callback.cc index 5022f4d..006e20e 100644 --- a/chrome_frame/urlmon_bind_status_callback.cc +++ b/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" diff --git a/chrome_frame/urlmon_moniker.cc b/chrome_frame/urlmon_moniker.cc index fce195c..d2d5b11 100644 --- a/chrome_frame/urlmon_moniker.cc +++ b/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" diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc index f0995be..51a4a0b 100644 --- a/chrome_frame/urlmon_url_request.cc +++ b/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" diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index 0498bef..f55c4bf 100644 --- a/chrome_frame/utils.cc +++ b/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" diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h index 4341880..744cab8 100644 --- a/chrome_frame/utils.h +++ b/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" |