diff options
Diffstat (limited to 'chrome/browser')
50 files changed, 93 insertions, 62 deletions
diff --git a/chrome/browser/apps/speech_recognition_browsertest.cc b/chrome/browser/apps/app_speech_recognition_browsertest.cc index e413aa5..e413aa5 100644 --- a/chrome/browser/apps/speech_recognition_browsertest.cc +++ b/chrome/browser/apps/app_speech_recognition_browsertest.cc diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn index 4abd9c4..a2ddbad 100644 --- a/chrome/browser/chromeos/BUILD.gn +++ b/chrome/browser/chromeos/BUILD.gn @@ -4,6 +4,7 @@ import("//build/config/features.gni") import("//build/config/ui.gni") +import("//chrome/chrome_tests.gni") import("//media/media_options.gni") import("//third_party/protobuf/proto_library.gni") @@ -28,6 +29,7 @@ source_set("chromeos") { "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", + "//components/wallpaper", "//content/app/resources", "//ui/chromeos/resources", "//ui/chromeos/strings", @@ -37,12 +39,14 @@ source_set("chromeos") { deps = [ # TODO(tbarzic): Cleanup this list. + ":attestation_proto", + ":device_policy_proto", + ":drive_proto", "//ash", "//ash:ash_with_content", "//components/login", "//components/session_manager/core", "//components/user_manager", - "//components/wallpaper", "//components/wifi_sync", "//chrome/browser/devtools", "//chrome/browser/extensions", @@ -118,9 +122,6 @@ source_set("chromeos") { "//ui/web_dialogs", "//url", "//v8", - ":attestation_proto", - ":device_policy_proto", - ":drive_proto", ] defines = [] @@ -160,6 +161,36 @@ source_set("chromeos") { } } +source_set("unit_tests") { + testonly = true + + sources = rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_chromeos_sources, + ".", + "//chrome") + + public_deps = [ + ":chromeos", + ] + deps = [ + ":attestation_proto", + ":device_policy_proto", + ":drive_proto", + "//ash/resources", + "//components/policy", + "//components/invalidation/public", + "//crypto:platform", + "//dbus", + "//skia", + "//sync", + "//testing/gmock", + "//testing/gtest", + "//third_party/leveldatabase", + "//third_party/mojo/src/mojo/public/cpp/system:system", + "//ui/chromeos/resources", + ] +} + proto_library("drive_proto") { sources = [ "drive/drive.proto", diff --git a/chrome/browser/chromeos/drive/change_list_loader_unittest.cc b/chrome/browser/chromeos/drive/change_list_loader_unittest.cc index 0a82ac5..7edc3cf 100644 --- a/chrome/browser/chromeos/drive/change_list_loader_unittest.cc +++ b/chrome/browser/chromeos/drive/change_list_loader_unittest.cc @@ -12,12 +12,12 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/change_list_loader_observer.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/event_logger.h" #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/drive/test_util.h" diff --git a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc index 42960ed..48231d7 100644 --- a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc +++ b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc @@ -9,12 +9,12 @@ #include "base/thread_task_runner_handle.h" #include "base/values.h" #include "chrome/browser/chromeos/drive/drive.pb.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" diff --git a/chrome/browser/chromeos/drive/directory_loader_unittest.cc b/chrome/browser/chromeos/drive/directory_loader_unittest.cc index d431a71..91a015d 100644 --- a/chrome/browser/chromeos/drive/directory_loader_unittest.cc +++ b/chrome/browser/chromeos/drive/directory_loader_unittest.cc @@ -13,11 +13,11 @@ #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/change_list_loader.h" #include "chrome/browser/chromeos/drive/change_list_loader_observer.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/event_logger.h" #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/drive/test_util.h" diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc index 2240714..c69d933 100644 --- a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc @@ -11,10 +11,10 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/threading/thread.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_file_system.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/local_file_reader.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/drive/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/chromeos/drive/test_util.cc b/chrome/browser/chromeos/drive/drive_test_util.cc index 644fb84..ede6cdc 100644 --- a/chrome/browser/chromeos/drive/test_util.cc +++ b/chrome/browser/chromeos/drive/drive_test_util.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 "chrome/browser/chromeos/drive/test_util.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/testing_pref_service.h" diff --git a/chrome/browser/chromeos/drive/test_util.h b/chrome/browser/chromeos/drive/drive_test_util.h index 2e418a8..e7904cb 100644 --- a/chrome/browser/chromeos/drive/test_util.h +++ b/chrome/browser/chromeos/drive/drive_test_util.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_TEST_UTIL_H_ -#define CHROME_BROWSER_CHROMEOS_DRIVE_TEST_UTIL_H_ +#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_TEST_UTIL_H_ +#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_TEST_UTIL_H_ #include <string> @@ -81,4 +81,4 @@ class FakeNetworkChangeNotifier : public net::NetworkChangeNotifier { } // namespace test_util } // namespace drive -#endif // CHROME_BROWSER_CHROMEOS_DRIVE_TEST_UTIL_H_ +#endif // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_TEST_UTIL_H_ diff --git a/chrome/browser/chromeos/drive/fake_free_disk_space_getter.cc b/chrome/browser/chromeos/drive/fake_free_disk_space_getter.cc index 7eaf030..17df38a 100644 --- a/chrome/browser/chromeos/drive/fake_free_disk_space_getter.cc +++ b/chrome/browser/chromeos/drive/fake_free_disk_space_getter.cc @@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" -#include "chrome/browser/chromeos/drive/test_util.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_cache_unittest.cc b/chrome/browser/chromeos/drive/file_cache_unittest.cc index e7ef041..a5ae9cf 100644 --- a/chrome/browser/chromeos/drive/file_cache_unittest.cc +++ b/chrome/browser/chromeos/drive/file_cache_unittest.cc @@ -16,10 +16,10 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/drive.pb.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/resource_metadata_storage.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.h b/chrome/browser/chromeos/drive/file_system/operation_test_base.h index a368f23..b65257e 100644 --- a/chrome/browser/chromeos/drive/file_system/operation_test_base.h +++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.h @@ -9,10 +9,10 @@ #include "base/files/scoped_temp_dir.h" #include "chrome/browser/chromeos/drive/drive.pb.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc b/chrome/browser/chromeos/drive/file_system_unittest.cc index 05a8090..c9ff562 100644 --- a/chrome/browser/chromeos/drive/file_system_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system_unittest.cc @@ -18,13 +18,13 @@ #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/change_list_loader.h" #include "chrome/browser/chromeos/drive/drive.pb.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/file_system_observer.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/sync_client.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/drive/event_logger.h" #include "chrome/browser/drive/fake_drive_service.h" diff --git a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc index 245e8f7..3727b22 100644 --- a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc +++ b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc @@ -12,10 +12,10 @@ #include "base/run_loop.h" #include "base/threading/thread.h" #include "base/time/time.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_file_system.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/drive/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc index 9a775c0..e36636d 100644 --- a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc +++ b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc @@ -16,7 +16,7 @@ #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/drive_pref_names.h" -#include "chrome/browser/chromeos/drive/test_util.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/drive/event_logger.h" #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/drive/test_util.h" diff --git a/chrome/browser/chromeos/drive/local_file_reader_unittest.cc b/chrome/browser/chromeos/drive/local_file_reader_unittest.cc index 3636d55..8a429e1 100644 --- a/chrome/browser/chromeos/drive/local_file_reader_unittest.cc +++ b/chrome/browser/chromeos/drive/local_file_reader_unittest.cc @@ -13,7 +13,7 @@ #include "base/message_loop/message_loop.h" #include "base/rand_util.h" #include "base/threading/thread.h" -#include "chrome/browser/chromeos/drive/test_util.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "google_apis/drive/test_util.h" #include "net/base/io_buffer.h" #include "net/base/test_completion_callback.h" diff --git a/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc b/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc index 3c72223..415a53b 100644 --- a/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc +++ b/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc @@ -11,11 +11,11 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/drive.pb.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/remove_stale_cache_files.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc index 3fc656d..fecc616 100644 --- a/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc @@ -12,7 +12,7 @@ #include "base/strings/string_split.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/drive.pb.h" -#include "chrome/browser/chromeos/drive/test_util.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" diff --git a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc index e1c497c..09e3353 100644 --- a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc @@ -13,10 +13,10 @@ #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/drive.pb.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/search_metadata_unittest.cc b/chrome/browser/chromeos/drive/search_metadata_unittest.cc index 52243b9..feb1da6 100644 --- a/chrome/browser/chromeos/drive/search_metadata_unittest.cc +++ b/chrome/browser/chromeos/drive/search_metadata_unittest.cc @@ -11,10 +11,10 @@ #include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/drive_api_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/sync_client_unittest.cc b/chrome/browser/chromeos/drive/sync_client_unittest.cc index 377251f..4c2b6db 100644 --- a/chrome/browser/chromeos/drive/sync_client_unittest.cc +++ b/chrome/browser/chromeos/drive/sync_client_unittest.cc @@ -15,6 +15,7 @@ #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/change_list_loader.h" #include "chrome/browser/chromeos/drive/drive.pb.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_change.h" @@ -25,7 +26,6 @@ #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/event_logger.h" #include "chrome/browser/drive/fake_drive_service.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc index 92a6698..f3bc8d4 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc @@ -6,8 +6,8 @@ #include "base/stl_util.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/extensions/file_manager/event_router.h" -#include "chrome/browser/chromeos/file_manager/drive_test_util.h" #include "chrome/browser/chromeos/file_manager/file_watcher.h" +#include "chrome/browser/chromeos/file_manager/mount_test_util.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/extensions/api/file_system_provider_capabilities/file_system_provider_capabilities_handler.h" diff --git a/chrome/browser/chromeos/extensions/launcher_search_provider.cc b/chrome/browser/chromeos/extensions/launcher_search_provider.cc index 70cf024..f041e1e 100644 --- a/chrome/browser/chromeos/extensions/launcher_search_provider.cc +++ b/chrome/browser/chromeos/extensions/launcher_search_provider.cc @@ -6,7 +6,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/launcher_search_provider/error_reporter.h" -#include "chrome/browser/chromeos/launcher_search_provider/service.h" +#include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h" #include "chrome/common/extensions/api/launcher_search_provider.h" #include "content/public/browser/render_frame_host.h" diff --git a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc index 1e8a372..c4cbcc7 100644 --- a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc +++ b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc @@ -10,7 +10,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/drive/drive_integration_service.h" #include "chrome/browser/chromeos/drive/file_system_util.h" -#include "chrome/browser/chromeos/file_manager/drive_test_util.h" +#include "chrome/browser/chromeos/file_manager/mount_test_util.h" #include "chrome/browser/chromeos/file_manager/volume_manager.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/drive/fake_drive_service.h" diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc index 06953e9..11f0dc8 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc @@ -15,7 +15,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" #include "chrome/browser/chromeos/drive/file_system_util.h" -#include "chrome/browser/chromeos/file_manager/drive_test_util.h" +#include "chrome/browser/chromeos/file_manager/mount_test_util.h" #include "chrome/browser/chromeos/file_manager/path_util.h" #include "chrome/browser/chromeos/file_manager/volume_manager.h" #include "chrome/browser/drive/fake_drive_service.h" diff --git a/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc b/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc index 0b837e2..a7065db 100644 --- a/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc +++ b/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "chrome/browser/chromeos/drive/drive_integration_service.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_file_system.h" -#include "chrome/browser/chromeos/drive/test_util.h" -#include "chrome/browser/chromeos/file_manager/drive_test_util.cc" #include "chrome/browser/chromeos/file_manager/fileapi_util.h" +#include "chrome/browser/chromeos/file_manager/mount_test_util.cc" #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/drive/test_util.h" #include "chrome/test/base/testing_browser_process.h" diff --git a/chrome/browser/chromeos/file_manager/drive_test_util.cc b/chrome/browser/chromeos/file_manager/mount_test_util.cc index 89af97e..df0e5e4 100644 --- a/chrome/browser/chromeos/file_manager/drive_test_util.cc +++ b/chrome/browser/chromeos/file_manager/mount_test_util.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 "chrome/browser/chromeos/file_manager/drive_test_util.h" +#include "chrome/browser/chromeos/file_manager/mount_test_util.h" #include "base/run_loop.h" #include "chrome/browser/chromeos/drive/drive_integration_service.h" diff --git a/chrome/browser/chromeos/file_manager/drive_test_util.h b/chrome/browser/chromeos/file_manager/mount_test_util.h index fb98cd4..db024a0 100644 --- a/chrome/browser/chromeos/file_manager/drive_test_util.h +++ b/chrome/browser/chromeos/file_manager/mount_test_util.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_DRIVE_TEST_UTIL_H_ -#define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_DRIVE_TEST_UTIL_H_ +#ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_MOUNT_TEST_UTIL_H_ +#define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_MOUNT_TEST_UTIL_H_ class Profile; @@ -18,4 +18,4 @@ void WaitUntilDriveMountPointIsAdded(Profile* profile); } // namespace test_util } // namespace file_manager -#endif // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_DRIVE_TEST_UTIL_H_ +#endif // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_MOUNT_TEST_UTIL_H_ diff --git a/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc b/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc index 8795336..658f810 100644 --- a/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc +++ b/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc @@ -12,9 +12,9 @@ #include "base/threading/thread.h" #include "chrome/browser/chromeos/drive/drive_file_stream_reader.h" #include "chrome/browser/chromeos/drive/drive_integration_service.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_file_system.h" #include "chrome/browser/chromeos/drive/file_system_util.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/drive/test_util.h" #include "chrome/browser/prefs/browser_prefs.h" diff --git a/chrome/browser/chromeos/first_run/first_run_browsertest.cc b/chrome/browser/chromeos/first_run/chromeos_first_run_browsertest.cc index 4801d50..4801d50 100644 --- a/chrome/browser/chromeos/first_run/first_run_browsertest.cc +++ b/chrome/browser/chromeos/first_run/chromeos_first_run_browsertest.cc diff --git a/chrome/browser/chromeos/launcher_search_provider/service.cc b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc index 64439e4..36547f03 100644 --- a/chrome/browser/chromeos/launcher_search_provider/service.cc +++ b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/chromeos/launcher_search_provider/service.h" +#include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h" #include "base/memory/scoped_vector.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/chromeos/launcher_search_provider/service_factory.h" +#include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h" #include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h" #include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_result.h" #include "extensions/browser/extension_registry.h" diff --git a/chrome/browser/chromeos/launcher_search_provider/service.h b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h index 8ff5c85..6536d19 100644 --- a/chrome/browser/chromeos/launcher_search_provider/service.h +++ b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_SERVICE_H_ -#define CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_SERVICE_H_ +#ifndef CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_LAUNCHER_SEARCH_PROVIDER_SERVICE_H_ +#define CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_LAUNCHER_SEARCH_PROVIDER_SERVICE_H_ #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/launcher_search_provider/error_reporter.h" @@ -88,4 +88,4 @@ class Service : public KeyedService, } // namespace launcher_search_provider } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_SERVICE_H_ +#endif // CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_LAUNCHER_SEARCH_PROVIDER_SERVICE_H_ diff --git a/chrome/browser/chromeos/launcher_search_provider/service_factory.cc b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.cc index d89ad96..cf49dde 100644 --- a/chrome/browser/chromeos/launcher_search_provider/service_factory.cc +++ b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/chromeos/launcher_search_provider/service_factory.h" +#include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h" -#include "chrome/browser/chromeos/launcher_search_provider/service.h" +#include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_registry_factory.h" diff --git a/chrome/browser/chromeos/launcher_search_provider/service_factory.h b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h index d2dcbc7..8da5962 100644 --- a/chrome/browser/chromeos/launcher_search_provider/service_factory.h +++ b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_SERVICE_FACTORY_H_ -#define CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_SERVICE_FACTORY_H_ +#ifndef CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_LAUNCHER_SEARCH_PROVIDER_SERVICE_FACTORY_H_ +#define CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_LAUNCHER_SEARCH_PROVIDER_SERVICE_FACTORY_H_ #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" @@ -40,4 +40,4 @@ class ServiceFactory : public BrowserContextKeyedServiceFactory { } // namespace launcher_search_provider } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_SERVICE_FACTORY_H_ +#endif // CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_LAUNCHER_SEARCH_PROVIDER_SERVICE_FACTORY_H_ diff --git a/chrome/browser/chromeos/preferences_browsertest.cc b/chrome/browser/chromeos/preferences_chromeos_browsertest.cc index ef44d88..ef44d88 100644 --- a/chrome/browser/chromeos/preferences_browsertest.cc +++ b/chrome/browser/chromeos/preferences_chromeos_browsertest.cc diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client.cc b/chrome/browser/extensions/api/chrome_extensions_api_client.cc index 8d5eca6..d8cabfb 100644 --- a/chrome/browser/extensions/api/chrome_extensions_api_client.cc +++ b/chrome/browser/extensions/api/chrome_extensions_api_client.cc @@ -11,7 +11,7 @@ #include "chrome/browser/extensions/api/storage/sync_value_store_cache.h" #include "chrome/browser/extensions/api/web_request/chrome_extension_web_request_event_router_delegate.h" #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/guest_view/app_view/chrome_app_view_guest_delegate.h" #include "chrome/browser/guest_view/extension_options/chrome_extension_options_guest_delegate.h" #include "chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.h" diff --git a/chrome/browser/favicon/favicon_helper.cc b/chrome/browser/favicon/favicon_utils.cc index 214c28b..7be1942 100644 --- a/chrome/browser/favicon/favicon_helper.cc +++ b/chrome/browser/favicon/favicon_utils.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 "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/favicon/favicon_service_factory.h" diff --git a/chrome/browser/favicon/favicon_helper.h b/chrome/browser/favicon/favicon_utils.h index 9b9af36..e8b8ad0 100644 --- a/chrome/browser/favicon/favicon_helper.h +++ b/chrome/browser/favicon/favicon_utils.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_FAVICON_FAVICON_HELPER_H_ -#define CHROME_BROWSER_FAVICON_FAVICON_HELPER_H_ +#ifndef CHROME_BROWSER_FAVICON_FAVICON_UTILS_H_ +#define CHROME_BROWSER_FAVICON_FAVICON_UTILS_H_ #include "components/favicon/content/content_favicon_driver.h" @@ -23,4 +23,4 @@ bool ShouldDisplayFavicon(content::WebContents* web_contents); } // namespace favicon -#endif // CHROME_BROWSER_FAVICON_FAVICON_HELPER_H_ +#endif // CHROME_BROWSER_FAVICON_FAVICON_UTILS_H_ diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc b/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc index 0a1dda0..db78792 100644 --- a/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc +++ b/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc @@ -6,7 +6,7 @@ #include "chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.h" #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" #include "chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h" diff --git a/chrome/browser/task_management/providers/web_contents/renderer_task.cc b/chrome/browser/task_management/providers/web_contents/renderer_task.cc index 32acdb1..f4f4890f 100644 --- a/chrome/browser/task_management/providers/web_contents/renderer_task.cc +++ b/chrome/browser/task_management/providers/web_contents/renderer_task.cc @@ -7,7 +7,7 @@ #include "base/i18n/rtl.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/task_manager/printing_information.cc b/chrome/browser/task_manager/printing_information.cc index 4f9d6f1..ac0d904 100644 --- a/chrome/browser/task_manager/printing_information.cc +++ b/chrome/browser/task_manager/printing_information.cc @@ -7,7 +7,7 @@ #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/printing/background_printing_manager.h" #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/task_manager/tab_contents_information.cc b/chrome/browser/task_manager/tab_contents_information.cc index c810e91..05ce45b 100644 --- a/chrome/browser/task_manager/tab_contents_information.cc +++ b/chrome/browser/task_manager/tab_contents_information.cc @@ -8,7 +8,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/devtools/devtools_window.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/prerender/prerender_manager_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.cc b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.cc index 6ed2ee6..5645fc0 100644 --- a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.cc +++ b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.cc @@ -6,7 +6,7 @@ #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/chromeos/launcher_search_provider/service.h" +#include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h" using chromeos::launcher_search_provider::Service; diff --git a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_result.cc b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_result.cc index 0bdd764..34c3bf7 100644 --- a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_result.cc +++ b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_result.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_result.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/chromeos/launcher_search_provider/service.h" +#include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h" #include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_impl.h" #include "chrome/browser/ui/app_list/search/search_util.h" diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc index 1103dd0..acba1a3 100644 --- a/chrome/browser/ui/apps/chrome_app_delegate.cc +++ b/chrome/browser/ui/apps/chrome_app_delegate.cc @@ -10,7 +10,7 @@ #include "chrome/browser/apps/scoped_keep_alive.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/file_select_helper.h" #include "chrome/browser/media/media_capture_devices_dispatcher.h" #include "chrome/browser/platform_util.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index fefd239..28b3e0c 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -19,7 +19,7 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/extensions/tab_helper.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/themes/theme_service.h" diff --git a/chrome/browser/ui/panels/panel_host.cc b/chrome/browser/ui/panels/panel_host.cc index 2e06dd2..2fbc91c 100644 --- a/chrome/browser/ui/panels/panel_host.cc +++ b/chrome/browser/ui/panels/panel_host.cc @@ -12,7 +12,7 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" #include "chrome/browser/extensions/window_controller.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/ui/browser_navigator.h" diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc index 1f52a63..9148e04 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc @@ -11,7 +11,7 @@ #include "chrome/browser/engagement/site_engagement_helper.h" #include "chrome/browser/engagement/site_engagement_service.h" #include "chrome/browser/external_protocol/external_protocol_observer.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/history/history_tab_helper.h" #include "chrome/browser/history/top_sites_factory.h" #include "chrome/browser/infobars/infobar_service.h" diff --git a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc index 904fec6..904fec6 100644 --- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index f501504..ddce28b 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -12,7 +12,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/tab_helper.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/search.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc index 76276b6..38ef896 100644 --- a/chrome/browser/web_applications/web_app_unittest.cc +++ b/chrome/browser/web_applications/web_app_unittest.cc @@ -16,7 +16,7 @@ #if defined(TOOLKIT_VIEWS) #include "chrome/browser/extensions/tab_helper.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #endif using content::RenderViewHostTester; |