diff options
Diffstat (limited to 'chrome/test')
49 files changed, 51 insertions, 51 deletions
diff --git a/chrome/test/automation/automation_json_requests.cc b/chrome/test/automation/automation_json_requests.cc index 56a3afd..fdfe3bb 100644 --- a/chrome/test/automation/automation_json_requests.cc +++ b/chrome/test/automation/automation_json_requests.cc @@ -5,7 +5,7 @@ #include "chrome/test/automation/automation_json_requests.h" #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/format_macros.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" diff --git a/chrome/test/automation/automation_json_requests.h b/chrome/test/automation/automation_json_requests.h index 120a542..df24832 100644 --- a/chrome/test/automation/automation_json_requests.h +++ b/chrome/test/automation/automation_json_requests.h @@ -9,7 +9,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/strings/string_number_conversions.h" #include "chrome/common/automation_constants.h" #include "chrome/common/automation_id.h" diff --git a/chrome/test/base/chrome_test_suite.h b/chrome/test/base/chrome_test_suite.h index ac786ae..9186f28 100644 --- a/chrome/test/base/chrome_test_suite.h +++ b/chrome/test/base/chrome_test_suite.h @@ -7,7 +7,7 @@ #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "content/public/test/content_test_suite_base.h" diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index cbda548..e56a1e7 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -7,8 +7,8 @@ #include "base/auto_reset.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/test/base/interactive_test_utils_win.cc b/chrome/test/base/interactive_test_utils_win.cc index 970fd1d..4b68f23 100644 --- a/chrome/test/base/interactive_test_utils_win.cc +++ b/chrome/test/base/interactive_test_utils_win.cc @@ -4,8 +4,8 @@ #include "chrome/test/base/interactive_test_utils.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/stringprintf.h" diff --git a/chrome/test/base/test_launcher_utils.h b/chrome/test/base/test_launcher_utils.h index a026746..242be69 100644 --- a/chrome/test/base/test_launcher_utils.h +++ b/chrome/test/base/test_launcher_utils.h @@ -8,7 +8,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/file_path.h" +#include "base/files/file_path.h" class CommandLine; diff --git a/chrome/test/base/testing_profile_manager.cc b/chrome/test/base/testing_profile_manager.cc index 7228cac..481d9ba 100644 --- a/chrome/test/base/testing_profile_manager.cc +++ b/chrome/test/base/testing_profile_manager.cc @@ -4,7 +4,7 @@ #include "chrome/test/base/testing_profile_manager.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile_info_cache.h" diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index e0a1a88..884de82 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -12,8 +12,8 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" diff --git a/chrome/test/base/v8_unit_test.h b/chrome/test/base/v8_unit_test.h index 9279aab..f5cb59e 100644 --- a/chrome/test/base/v8_unit_test.h +++ b/chrome/test/base/v8_unit_test.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string_piece.h" #include "testing/gtest/include/gtest/gtest.h" #include "v8/include/v8.h" diff --git a/chrome/test/base/web_ui_browsertest.h b/chrome/test/base/web_ui_browsertest.h index 1744725..8386c51 100644 --- a/chrome/test/base/web_ui_browsertest.h +++ b/chrome/test/base/web_ui_browsertest.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_vector.h" #include "base/string16.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/test/chromedriver/chrome_android_impl.cc b/chrome/test/chromedriver/chrome_android_impl.cc index 53d4ddf..def60c7 100644 --- a/chrome/test/chromedriver/chrome_android_impl.cc +++ b/chrome/test/chromedriver/chrome_android_impl.cc @@ -5,7 +5,7 @@ #include "chrome/test/chromedriver/chrome_android_impl.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process_util.h" #include "base/string_number_conversions.h" #include "chrome/test/chromedriver/net/sync_websocket_impl.h" diff --git a/chrome/test/chromedriver/chrome_desktop_impl.cc b/chrome/test/chromedriver/chrome_desktop_impl.cc index ea8ee27..a6233c4 100644 --- a/chrome/test/chromedriver/chrome_desktop_impl.cc +++ b/chrome/test/chromedriver/chrome_desktop_impl.cc @@ -5,7 +5,7 @@ #include "chrome/test/chromedriver/chrome_desktop_impl.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process.h" #include "base/process_util.h" #include "base/string_number_conversions.h" diff --git a/chrome/test/chromedriver/chrome_finder.cc b/chrome/test/chromedriver/chrome_finder.cc index 0d5c8d7..4a6e420 100644 --- a/chrome/test/chromedriver/chrome_finder.cc +++ b/chrome/test/chromedriver/chrome_finder.cc @@ -11,8 +11,8 @@ #include "base/bind.h" #include "base/callback.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" diff --git a/chrome/test/chromedriver/chrome_finder_mac.mm b/chrome/test/chromedriver/chrome_finder_mac.mm index 5a07d65..f2fe490 100644 --- a/chrome/test/chromedriver/chrome_finder_mac.mm +++ b/chrome/test/chromedriver/chrome_finder_mac.mm @@ -4,7 +4,7 @@ #import <Foundation/Foundation.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/foundation_util.h" void GetApplicationDirs(std::vector<base::FilePath>* app_dirs) { diff --git a/chrome/test/chromedriver/chrome_finder_unittest.cc b/chrome/test/chromedriver/chrome_finder_unittest.cc index d912f91..7815c7e 100644 --- a/chrome/test/chromedriver/chrome_finder_unittest.cc +++ b/chrome/test/chromedriver/chrome_finder_unittest.cc @@ -6,7 +6,7 @@ #include <vector> #include "base/bind.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/test/chromedriver/chrome_finder.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/test/chromedriver/chrome_launcher_impl.cc b/chrome/test/chromedriver/chrome_launcher_impl.cc index da65a07..e811582 100644 --- a/chrome/test/chromedriver/chrome_launcher_impl.cc +++ b/chrome/test/chromedriver/chrome_launcher_impl.cc @@ -7,7 +7,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/process.h" #include "base/process_util.h" #include "base/stringprintf.h" diff --git a/chrome/test/chromedriver/commands_unittest.cc b/chrome/test/chromedriver/commands_unittest.cc index 08b3393..8baa18a 100644 --- a/chrome/test/chromedriver/commands_unittest.cc +++ b/chrome/test/chromedriver/commands_unittest.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/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/synchronization/lock.h" #include "base/values.h" diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc index 9660761..0fae72c 100644 --- a/chrome/test/gpu/gpu_pixel_browsertest.cc +++ b/chrome/test/gpu/gpu_pixel_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/chrome/test/logging/win/file_logger.cc b/chrome/test/logging/win/file_logger.cc index 56889a1..9702058 100644 --- a/chrome/test/logging/win/file_logger.cc +++ b/chrome/test/logging/win/file_logger.cc @@ -11,8 +11,8 @@ #include <ios> #include "base/debug/trace_event_win.h" +#include "base/files/file_path.h" #include "base/logging.h" -#include "base/file_path.h" #include "base/logging_win.h" #include "base/string16.h" #include "base/utf_string_conversions.h" diff --git a/chrome/test/logging/win/log_file_reader.cc b/chrome/test/logging/win/log_file_reader.cc index 6259e1c..9fa8985 100644 --- a/chrome/test/logging/win/log_file_reader.cc +++ b/chrome/test/logging/win/log_file_reader.cc @@ -5,7 +5,7 @@ #include "chrome/test/logging/win/log_file_reader.h" #include "base/debug/trace_event_win.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/lazy_instance.h" #include "base/logging_win.h" #include "base/synchronization/lock.h" diff --git a/chrome/test/logging/win/test_log_collector.cc b/chrome/test/logging/win/test_log_collector.cc index 6350406..0bb1f24 100644 --- a/chrome/test/logging/win/test_log_collector.cc +++ b/chrome/test/logging/win/test_log_collector.cc @@ -11,8 +11,8 @@ #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/lazy_instance.h" #include "base/logging.h" diff --git a/chrome/test/mini_installer_test/installer_path_provider.h b/chrome/test/mini_installer_test/installer_path_provider.h index 6a2f411..98e1b77 100644 --- a/chrome/test/mini_installer_test/installer_path_provider.h +++ b/chrome/test/mini_installer_test/installer_path_provider.h @@ -6,7 +6,7 @@ #define CHROME_TEST_MINI_INSTALLER_TEST_INSTALLER_PATH_PROVIDER_H_ #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" namespace installer_test { diff --git a/chrome/test/mini_installer_test/installer_test_util.h b/chrome/test/mini_installer_test/installer_test_util.h index 1be3e56..bda2617 100644 --- a/chrome/test/mini_installer_test/installer_test_util.h +++ b/chrome/test/mini_installer_test/installer_test_util.h @@ -8,7 +8,7 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "chrome/installer/util/installation_validator.h" #include "chrome/test/mini_installer_test/switch_builder.h" diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc index eda0b0e..5d5fb4e 100644 --- a/chrome/test/mini_installer_test/test.cc +++ b/chrome/test/mini_installer_test/test.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 "base/memory/scoped_ptr.h" #include "base/process_util.h" #include "base/string_util.h" @@ -13,8 +13,8 @@ #include "chrome/installer/util/installation_validator.h" #include "chrome/installer/util/util_constants.h" #include "chrome/test/mini_installer_test/installer_path_provider.h" -#include "chrome/test/mini_installer_test/mini_installer_test_constants.h" #include "chrome/test/mini_installer_test/installer_test_util.h" +#include "chrome/test/mini_installer_test/mini_installer_test_constants.h" #include "chrome/test/mini_installer_test/switch_builder.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/test/nacl/nacl_browsertest_util.h b/chrome/test/nacl/nacl_browsertest_util.h index 972e86b..104b466 100644 --- a/chrome/test/nacl/nacl_browsertest_util.h +++ b/chrome/test/nacl/nacl_browsertest_util.h @@ -5,7 +5,7 @@ #ifndef CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ #define CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/javascript_test_observer.h" diff --git a/chrome/test/perf/dom_checker_uitest.cc b/chrome/test/perf/dom_checker_uitest.cc index aca6b4b..f4db35a 100644 --- a/chrome/test/perf/dom_checker_uitest.cc +++ b/chrome/test/perf/dom_checker_uitest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_string_value_serializer.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/test/perf/indexeddb_uitest.cc b/chrome/test/perf/indexeddb_uitest.cc index 66ed7e4..787f2bf1 100644 --- a/chrome/test/perf/indexeddb_uitest.cc +++ b/chrome/test/perf/indexeddb_uitest.cc @@ -2,12 +2,12 @@ // 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/files/file_path.h" #include "base/path_service.h" #include "base/test/test_timeouts.h" #include "base/utf_string_conversions.h" -#include "chrome/common/chrome_paths.h" #include "chrome/common/automation_constants.h" +#include "chrome/common/chrome_paths.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/perf/perf_test.h" #include "chrome/test/ui/javascript_test_util.h" diff --git a/chrome/test/perf/memory_test.cc b/chrome/test/perf/memory_test.cc index 822d443..65fd0da5 100644 --- a/chrome/test/perf/memory_test.cc +++ b/chrome/test/perf/memory_test.cc @@ -4,8 +4,8 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/string_util.h" diff --git a/chrome/test/perf/page_cycler_test.cc b/chrome/test/perf/page_cycler_test.cc index f72e247..1c07a89 100644 --- a/chrome/test/perf/page_cycler_test.cc +++ b/chrome/test/perf/page_cycler_test.cc @@ -4,8 +4,8 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/process_util.h" #include "base/string_piece.h" diff --git a/chrome/test/perf/rendering/throughput_tests.cc b/chrome/test/perf/rendering/throughput_tests.cc index b9e3086..e7c25aa 100644 --- a/chrome/test/perf/rendering/throughput_tests.cc +++ b/chrome/test/perf/rendering/throughput_tests.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/test/perf/tab_switching_test.cc b/chrome/test/perf/tab_switching_test.cc index c850567..45a0891 100644 --- a/chrome/test/perf/tab_switching_test.cc +++ b/chrome/test/perf/tab_switching_test.cc @@ -4,8 +4,8 @@ #include "base/command_line.h" #include "base/environment.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/stringprintf.h" diff --git a/chrome/test/perf/url_fetch_test.cc b/chrome/test/perf/url_fetch_test.cc index f4a05725..4a88f29 100644 --- a/chrome/test/perf/url_fetch_test.cc +++ b/chrome/test/perf/url_fetch_test.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/path_service.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/chrome/test/reliability/automated_ui_tests.cc b/chrome/test/reliability/automated_ui_tests.cc index 2fcd1c7..2c371c4 100644 --- a/chrome/test/reliability/automated_ui_tests.cc +++ b/chrome/test/reliability/automated_ui_tests.cc @@ -8,9 +8,9 @@ #include "base/command_line.h" #include "base/environment.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/logging.h" #include "base/path_service.h" diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc index 303ef3d..18d78e3 100644 --- a/chrome/test/reliability/page_load_test.cc +++ b/chrome/test/reliability/page_load_test.cc @@ -39,9 +39,9 @@ #include "base/command_line.h" #include "base/environment.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/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 60c78cd..c5010b0 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -16,8 +16,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" diff --git a/chrome/test/webdriver/commands/chrome_commands.cc b/chrome/test/webdriver/commands/chrome_commands.cc index 1b470aa..f470f29 100644 --- a/chrome/test/webdriver/commands/chrome_commands.cc +++ b/chrome/test/webdriver/commands/chrome_commands.cc @@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/stringprintf.h" #include "chrome/test/automation/value_conversion_util.h" #include "chrome/test/webdriver/commands/response.h" diff --git a/chrome/test/webdriver/commands/create_session.cc b/chrome/test/webdriver/commands/create_session.cc index 06a95c3..ef53ee7 100644 --- a/chrome/test/webdriver/commands/create_session.cc +++ b/chrome/test/webdriver/commands/create_session.cc @@ -7,7 +7,7 @@ #include <string> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/values.h" #include "chrome/test/webdriver/commands/response.h" diff --git a/chrome/test/webdriver/webdriver_automation.cc b/chrome/test/webdriver/webdriver_automation.cc index 67c0ced..f604d78 100644 --- a/chrome/test/webdriver/webdriver_automation.cc +++ b/chrome/test/webdriver/webdriver_automation.cc @@ -12,8 +12,8 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/environment.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_writer.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" diff --git a/chrome/test/webdriver/webdriver_automation.h b/chrome/test/webdriver/webdriver_automation.h index 5ca1d16..4c3c646 100644 --- a/chrome/test/webdriver/webdriver_automation.h +++ b/chrome/test/webdriver/webdriver_automation.h @@ -10,7 +10,7 @@ #include <vector> #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/common/automation_constants.h" diff --git a/chrome/test/webdriver/webdriver_capabilities_parser.h b/chrome/test/webdriver/webdriver_capabilities_parser.h index 583a759..518d3ee 100644 --- a/chrome/test/webdriver/webdriver_capabilities_parser.h +++ b/chrome/test/webdriver/webdriver_capabilities_parser.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "chrome/test/webdriver/webdriver_logging.h" diff --git a/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc b/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc index 884bddb..5ae36b3 100644 --- a/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc +++ b/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/base64.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/values.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/test/webdriver/webdriver_logging.cc b/chrome/test/webdriver/webdriver_logging.cc index 467205c..5a597bf 100644 --- a/chrome/test/webdriver/webdriver_logging.cc +++ b/chrome/test/webdriver/webdriver_logging.cc @@ -6,8 +6,8 @@ #include <cmath> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/chrome/test/webdriver/webdriver_logging.h b/chrome/test/webdriver/webdriver_logging.h index ad39ab7..f257e87 100644 --- a/chrome/test/webdriver/webdriver_logging.h +++ b/chrome/test/webdriver/webdriver_logging.h @@ -9,8 +9,8 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/synchronization/lock.h" #include "base/values.h" diff --git a/chrome/test/webdriver/webdriver_server.cc b/chrome/test/webdriver/webdriver_server.cc index c25f7fe..cc4339f 100644 --- a/chrome/test/webdriver/webdriver_server.cc +++ b/chrome/test/webdriver/webdriver_server.cc @@ -15,8 +15,8 @@ #include "base/at_exit.h" #include "base/base_paths.h" #include "base/command_line.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/string_split.h" diff --git a/chrome/test/webdriver/webdriver_session.cc b/chrome/test/webdriver/webdriver_session.cc index 164d506..9d50dde 100644 --- a/chrome/test/webdriver/webdriver_session.cc +++ b/chrome/test/webdriver/webdriver_session.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/callback.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/test/webdriver/webdriver_session.h b/chrome/test/webdriver/webdriver_session.h index 9f02c4a..9791cec 100644 --- a/chrome/test/webdriver/webdriver_session.h +++ b/chrome/test/webdriver/webdriver_session.h @@ -10,7 +10,7 @@ #include <vector> #include "base/callback_forward.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" diff --git a/chrome/test/webdriver/webdriver_session_manager.h b/chrome/test/webdriver/webdriver_session_manager.h index 60666dd..bedf0a6 100644 --- a/chrome/test/webdriver/webdriver_session_manager.h +++ b/chrome/test/webdriver/webdriver_session_manager.h @@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/singleton.h" #include "base/synchronization/lock.h" diff --git a/chrome/test/webdriver/webdriver_util_mac.mm b/chrome/test/webdriver/webdriver_util_mac.mm index a4050fe..e898996 100644 --- a/chrome/test/webdriver/webdriver_util_mac.mm +++ b/chrome/test/webdriver/webdriver_util_mac.mm @@ -6,7 +6,7 @@ #import <Foundation/Foundation.h> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/mac/foundation_util.h" namespace webdriver { diff --git a/chrome/test/webdriver/webdriver_util_unittest.cc b/chrome/test/webdriver/webdriver_util_unittest.cc index ee1f15f..a888b01 100644 --- a/chrome/test/webdriver/webdriver_util_unittest.cc +++ b/chrome/test/webdriver/webdriver_util_unittest.cc @@ -6,8 +6,8 @@ #include <string> #include "base/base64.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "chrome/test/webdriver/webdriver_util.h" #include "testing/gtest/include/gtest/gtest.h" |