diff options
Diffstat (limited to 'chrome_frame')
20 files changed, 28 insertions, 27 deletions
diff --git a/chrome_frame/bho.cc b/chrome_frame/bho.cc index b063034..f3e32e0 100644 --- a/chrome_frame/bho.cc +++ b/chrome_frame/bho.cc @@ -6,7 +6,7 @@ #include <shlguid.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/chrome_frame/chrome_frame_delegate.h b/chrome_frame/chrome_frame_delegate.h index 828e8f7..d880d59 100644 --- a/chrome_frame/chrome_frame_delegate.h +++ b/chrome_frame/chrome_frame_delegate.h @@ -12,7 +12,7 @@ #include <vector> #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/location.h" #include "base/pending_task.h" #include "base/synchronization/lock.h" diff --git a/chrome_frame/chrome_launcher_unittest.cc b/chrome_frame/chrome_launcher_unittest.cc index 0fa88a7..b1022db 100644 --- a/chrome_frame/chrome_launcher_unittest.cc +++ b/chrome_frame/chrome_launcher_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/common/chrome_switches.h" #include "chrome_frame/chrome_launcher.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome_frame/crash_reporting/minidump_test.cc b/chrome_frame/crash_reporting/minidump_test.cc index 00edf11..e9766ab 100644 --- a/chrome_frame/crash_reporting/minidump_test.cc +++ b/chrome_frame/crash_reporting/minidump_test.cc @@ -3,14 +3,14 @@ // found in the LICENSE file. #include <windows.h> -#include <objbase.h> #include <dbghelp.h> +#include <objbase.h> #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/win/scoped_handle.h" #include "gtest/gtest.h" diff --git a/chrome_frame/dll_redirector.cc b/chrome_frame/dll_redirector.cc index f5b6b4b..5c9943d 100644 --- a/chrome_frame/dll_redirector.cc +++ b/chrome_frame/dll_redirector.cc @@ -9,8 +9,8 @@ #include <atlsecurity.h> #include <sddl.h> -#include "base/file_path.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/shared_memory.h" diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc index a1d1bcd..97026aa 100644 --- a/chrome_frame/simple_resource_loader.cc +++ b/chrome_frame/simple_resource_loader.cc @@ -9,11 +9,11 @@ #include <algorithm> #include "base/base_paths.h" -#include "base/file_path.h" #include "base/file_util.h" -#include "base/path_service.h" +#include "base/files/file_path.h" #include "base/i18n/rtl.h" #include "base/memory/singleton.h" +#include "base/path_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win/i18n.h" diff --git a/chrome_frame/simple_resource_loader.h b/chrome_frame/simple_resource_loader.h index 9c31887..66b22bb 100644 --- a/chrome_frame/simple_resource_loader.h +++ b/chrome_frame/simple_resource_loader.h @@ -14,7 +14,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/singleton.h" diff --git a/chrome_frame/test/chrome_frame_automation_mock.h b/chrome_frame/test/chrome_frame_automation_mock.h index 8399d53..a550d5d 100644 --- a/chrome_frame/test/chrome_frame_automation_mock.h +++ b/chrome_frame/test/chrome_frame_automation_mock.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index ac6afe6..ac52ea7 100644 --- a/chrome_frame/test/chrome_frame_test_utils.cc +++ b/chrome_frame/test/chrome_frame_test_utils.cc @@ -12,9 +12,9 @@ #include <winsock2.h> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/process.h" diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h index 59b00ef..bb3480df 100644 --- a/chrome_frame/test/chrome_frame_test_utils.h +++ b/chrome_frame/test/chrome_frame_test_utils.h @@ -15,14 +15,14 @@ #include "base/basictypes.h" #include "base/cancelable_callback.h" #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/run_loop.h" #include "base/process_util.h" -#include "base/time.h" +#include "base/run_loop.h" #include "base/test/test_reg_util_win.h" #include "base/time.h" +#include "base/time.h" #include "base/win/registry.h" #include "base/win/scoped_comptr.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome_frame/test/chrome_frame_ui_test_utils.h b/chrome_frame/test/chrome_frame_ui_test_utils.h index 7f98a79..2fee769 100644 --- a/chrome_frame/test/chrome_frame_ui_test_utils.h +++ b/chrome_frame/test/chrome_frame_ui_test_utils.h @@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_variant.h" diff --git a/chrome_frame/test/dll_redirector_loading_test.cc b/chrome_frame/test/dll_redirector_loading_test.cc index 7182559..3da41cd 100644 --- a/chrome_frame/test/dll_redirector_loading_test.cc +++ b/chrome_frame/test/dll_redirector_loading_test.cc @@ -6,9 +6,9 @@ // generates a new version of CF from the one already in the build folder and // then loads them both into the current process to verify the handoff. -#include "base/file_path.h" #include "base/file_util.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/scoped_native_library.h" diff --git a/chrome_frame/test/mock_ie_event_sink_test.h b/chrome_frame/test/mock_ie_event_sink_test.h index fcc7f2e..2d99cb2 100644 --- a/chrome_frame/test/mock_ie_event_sink_test.h +++ b/chrome_frame/test/mock_ie_event_sink_test.h @@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h index cb4337b..1c1e9f4 100644 --- a/chrome_frame/test/net/fake_external_tab.h +++ b/chrome_frame/test/net/fake_external_tab.h @@ -8,7 +8,7 @@ #include <string> #include "base/cancelable_callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/process.h" #include "base/win/scoped_handle.h" diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc index 90d2fbd..4fa629f 100644 --- a/chrome_frame/test/perf/chrome_frame_perftest.cc +++ b/chrome_frame/test/perf/chrome_frame_perftest.cc @@ -5,13 +5,14 @@ #include <atlwin.h> #include <atlhost.h> + #include <map> -#include <vector> #include <string> +#include <vector> #include "base/debug/trace_event_win.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/process_util.h" diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index f281d20..4d67392 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -23,9 +23,9 @@ #include <ostream> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" #include "base/file_version_info.h" +#include "base/files/file_path.h" #include "base/i18n/time_formatting.h" #include "base/path_service.h" #include "base/prefs/json_pref_store.h" diff --git a/chrome_frame/test/simple_resource_loader_test.cc b/chrome_frame/test/simple_resource_loader_test.cc index d9f60cc8..37070e3 100644 --- a/chrome_frame/test/simple_resource_loader_test.cc +++ b/chrome_frame/test/simple_resource_loader_test.cc @@ -4,7 +4,7 @@ #include "chrome_frame/simple_resource_loader.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/win/windows_version.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/data_pack.h" diff --git a/chrome_frame/test/test_scrubber.cc b/chrome_frame/test/test_scrubber.cc index a927d70..ac1a0d2 100644 --- a/chrome_frame/test/test_scrubber.cc +++ b/chrome_frame/test/test_scrubber.cc @@ -11,8 +11,8 @@ #include <windows.h> #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/process_util.h" diff --git a/chrome_frame/test/util_unittests.cc b/chrome_frame/test/util_unittests.cc index f952dcf5..d4dd42f 100644 --- a/chrome_frame/test/util_unittests.cc +++ b/chrome_frame/test/util_unittests.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" #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/utf_string_conversions.h" #include "base/win/registry.h" #include "chrome_frame/navigation_constraints.h" -#include "chrome_frame/test/chrome_frame_test_utils.h" #include "chrome_frame/registry_list_preferences_holder.h" +#include "chrome_frame/test/chrome_frame_test_utils.h" #include "chrome_frame/utils.h" -#include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" using base::win::RegKey; diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc index fd1ec78..7e516a8 100644 --- a/chrome_frame/test_utils.cc +++ b/chrome_frame/test_utils.cc @@ -12,8 +12,8 @@ #include <algorithm> #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/path_service.h" #include "base/process_util.h" |