diff options
145 files changed, 467 insertions, 279 deletions
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index abcf646..72240c6 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -353,6 +353,7 @@ source_set("browser") { "//chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_proto", "//chrome/common/extensions/api", "//chrome/common/extensions/api:api_registration", + "//components/drive:drive", "//components/proximity_auth/ble", "//components/proximity_auth/cryptauth", "//extensions/components/javascript_dialog_extensions_client", @@ -1147,12 +1148,6 @@ source_set("test_support") { if (enable_extensions) { sources += [ - "drive/dummy_drive_service.cc", - "drive/dummy_drive_service.h", - "drive/fake_drive_service.cc", - "drive/fake_drive_service.h", - "drive/test_util.cc", - "drive/test_util.h", "extensions/api/messaging/native_messaging_test_util.cc", "extensions/api/messaging/native_messaging_test_util.h", "extensions/extension_notification_observer.cc", @@ -1176,7 +1171,10 @@ source_set("test_support") { "media_galleries/media_galleries_test_util.cc", "media_galleries/media_galleries_test_util.h", ] - deps += [ "//components/storage_monitor:test_support" ] + deps += [ + "//components/drive:test_support", + "//components/storage_monitor:test_support", + ] } if (enable_mdns) { diff --git a/chrome/browser/apps/drive/DEPS b/chrome/browser/apps/drive/DEPS new file mode 100644 index 0000000..cdad3c2 --- /dev/null +++ b/chrome/browser/apps/drive/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+components/drive", +] diff --git a/chrome/browser/apps/drive/drive_app_converter.h b/chrome/browser/apps/drive/drive_app_converter.h index 515f9ef..777e5b63 100644 --- a/chrome/browser/apps/drive/drive_app_converter.h +++ b/chrome/browser/apps/drive/drive_app_converter.h @@ -11,9 +11,9 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" -#include "chrome/browser/drive/drive_app_registry.h" #include "chrome/browser/extensions/install_observer.h" #include "chrome/common/web_application_info.h" +#include "components/drive/drive_app_registry.h" class Profile; diff --git a/chrome/browser/apps/drive/drive_app_provider.cc b/chrome/browser/apps/drive/drive_app_provider.cc index 3aac05c..06f31a1 100644 --- a/chrome/browser/apps/drive/drive_app_provider.cc +++ b/chrome/browser/apps/drive/drive_app_provider.cc @@ -17,10 +17,10 @@ #include "chrome/browser/apps/drive/drive_app_mapping.h" #include "chrome/browser/apps/drive/drive_app_uninstall_sync_service.h" #include "chrome/browser/apps/drive/drive_service_bridge.h" -#include "chrome/browser/drive/drive_app_registry.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" +#include "components/drive/drive_app_registry.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_registry_factory.h" #include "extensions/browser/extension_system.h" diff --git a/chrome/browser/apps/drive/drive_app_provider.h b/chrome/browser/apps/drive/drive_app_provider.h index 56e76a7..8b87382 100644 --- a/chrome/browser/apps/drive/drive_app_provider.h +++ b/chrome/browser/apps/drive/drive_app_provider.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/drive/drive_app_registry_observer.h" +#include "components/drive/drive_app_registry_observer.h" #include "extensions/browser/extension_registry_observer.h" namespace drive { diff --git a/chrome/browser/apps/drive/drive_app_provider_browsertest.cc b/chrome/browser/apps/drive/drive_app_provider_browsertest.cc index 8b4ebf7..9d5f323 100644 --- a/chrome/browser/apps/drive/drive_app_provider_browsertest.cc +++ b/chrome/browser/apps/drive/drive_app_provider_browsertest.cc @@ -16,8 +16,6 @@ #include "chrome/browser/apps/drive/drive_app_mapping.h" #include "chrome/browser/apps/drive/drive_app_uninstall_sync_service.h" #include "chrome/browser/apps/drive/drive_service_bridge.h" -#include "chrome/browser/drive/drive_app_registry.h" -#include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/install_tracker.h" @@ -26,6 +24,8 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/web_application_info.h" +#include "components/drive/drive_app_registry.h" +#include "components/drive/service/fake_drive_service.h" #include "content/public/test/test_utils.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" diff --git a/chrome/browser/apps/drive/drive_service_bridge.cc b/chrome/browser/apps/drive/drive_service_bridge.cc index bb56d03..f3facb04 100644 --- a/chrome/browser/apps/drive/drive_service_bridge.cc +++ b/chrome/browser/apps/drive/drive_service_bridge.cc @@ -7,14 +7,14 @@ #include <string> #include "base/logging.h" -#include "chrome/browser/drive/drive_api_service.h" -#include "chrome/browser/drive/drive_app_registry.h" -#include "chrome/browser/drive/drive_notification_manager.h" #include "chrome/browser/drive/drive_notification_manager_factory.h" -#include "chrome/browser/drive/drive_notification_observer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/signin/signin_manager_factory.h" +#include "components/drive/drive_app_registry.h" +#include "components/drive/drive_notification_manager.h" +#include "components/drive/drive_notification_observer.h" +#include "components/drive/service/drive_api_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/chromeos/drive/DEPS b/chrome/browser/chromeos/drive/DEPS new file mode 100644 index 0000000..cdad3c2 --- /dev/null +++ b/chrome/browser/chromeos/drive/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+components/drive", +] diff --git a/chrome/browser/chromeos/drive/change_list_loader.cc b/chrome/browser/chromeos/drive/change_list_loader.cc index 105b1a7..abe0fa4 100644 --- a/chrome/browser/chromeos/drive/change_list_loader.cc +++ b/chrome/browser/chromeos/drive/change_list_loader.cc @@ -18,7 +18,7 @@ #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/drive/event_logger.h" +#include "components/drive/event_logger.h" #include "google_apis/drive/drive_api_parser.h" #include "url/gurl.h" diff --git a/chrome/browser/chromeos/drive/change_list_loader_unittest.cc b/chrome/browser/chromeos/drive/change_list_loader_unittest.cc index 7edc3cf..fdff7e6 100644 --- a/chrome/browser/chromeos/drive/change_list_loader_unittest.cc +++ b/chrome/browser/chromeos/drive/change_list_loader_unittest.cc @@ -18,9 +18,9 @@ #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/drive/event_logger.h" -#include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/drive/test_util.h" +#include "components/drive/event_logger.h" +#include "components/drive/service/fake_drive_service.h" +#include "components/drive/service/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/change_list_processor.cc b/chrome/browser/chromeos/drive/change_list_processor.cc index b8f24b8..342efee 100644 --- a/chrome/browser/chromeos/drive/change_list_processor.cc +++ b/chrome/browser/chromeos/drive/change_list_processor.cc @@ -12,7 +12,7 @@ #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" -#include "chrome/browser/drive/drive_api_util.h" +#include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/directory_loader.cc b/chrome/browser/chromeos/drive/directory_loader.cc index 9dfdc0ea..8e9cea2 100644 --- a/chrome/browser/chromeos/drive/directory_loader.cc +++ b/chrome/browser/chromeos/drive/directory_loader.cc @@ -15,7 +15,7 @@ #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/drive/event_logger.h" +#include "components/drive/event_logger.h" #include "google_apis/drive/drive_api_parser.h" #include "url/gurl.h" diff --git a/chrome/browser/chromeos/drive/directory_loader_unittest.cc b/chrome/browser/chromeos/drive/directory_loader_unittest.cc index 91a015d..525e569 100644 --- a/chrome/browser/chromeos/drive/directory_loader_unittest.cc +++ b/chrome/browser/chromeos/drive/directory_loader_unittest.cc @@ -18,9 +18,9 @@ #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/drive/event_logger.h" -#include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/drive/test_util.h" +#include "components/drive/event_logger.h" +#include "components/drive/service/fake_drive_service.h" +#include "components/drive/service/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/drive_file_stream_reader_unittest.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc index c69d933..dcf7fdc 100644 --- a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc @@ -15,8 +15,8 @@ #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/drive/fake_drive_service.h" -#include "chrome/browser/drive/test_util.h" +#include "components/drive/service/fake_drive_service.h" +#include "components/drive/service/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" #include "google_apis/drive/drive_api_parser.h" diff --git a/chrome/browser/chromeos/drive/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc index da85677..948859b 100644 --- a/chrome/browser/chromeos/drive/drive_integration_service.cc +++ b/chrome/browser/chromeos/drive/drive_integration_service.cc @@ -26,12 +26,7 @@ #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/download/download_service.h" #include "chrome/browser/download/download_service_factory.h" -#include "chrome/browser/drive/drive_api_service.h" -#include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/drive/drive_app_registry.h" -#include "chrome/browser/drive/drive_notification_manager.h" #include "chrome/browser/drive/drive_notification_manager_factory.h" -#include "chrome/browser/drive/event_logger.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" @@ -39,6 +34,11 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/drive_app_registry.h" +#include "components/drive/drive_notification_manager.h" +#include "components/drive/event_logger.h" +#include "components/drive/service/drive_api_service.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" diff --git a/chrome/browser/chromeos/drive/drive_integration_service.h b/chrome/browser/chromeos/drive/drive_integration_service.h index 2c3809d..71b75d3 100644 --- a/chrome/browser/chromeos/drive/drive_integration_service.h +++ b/chrome/browser/chromeos/drive/drive_integration_service.h @@ -13,7 +13,7 @@ #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" -#include "chrome/browser/drive/drive_notification_observer.h" +#include "components/drive/drive_notification_observer.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc b/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc index 74d2aa2..4572b53 100644 --- a/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc @@ -5,10 +5,10 @@ #include "chrome/browser/chromeos/drive/drive_integration_service.h" #include "chrome/browser/chromeos/drive/dummy_file_system.h" -#include "chrome/browser/drive/dummy_drive_service.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" +#include "components/drive/service/dummy_drive_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/fake_file_system.cc b/chrome/browser/chromeos/drive/fake_file_system.cc index 592b252..58c90f3 100644 --- a/chrome/browser/chromeos/drive/fake_file_system.cc +++ b/chrome/browser/chromeos/drive/fake_file_system.cc @@ -14,7 +14,7 @@ #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" -#include "chrome/browser/drive/drive_service_interface.h" +#include "components/drive/service/drive_service_interface.h" #include "content/public/browser/browser_thread.h" #include "google_apis/drive/drive_api_parser.h" diff --git a/chrome/browser/chromeos/drive/fake_file_system_unittest.cc b/chrome/browser/chromeos/drive/fake_file_system_unittest.cc index 7e88bd6..cacec3a 100644 --- a/chrome/browser/chromeos/drive/fake_file_system_unittest.cc +++ b/chrome/browser/chromeos/drive/fake_file_system_unittest.cc @@ -7,8 +7,8 @@ #include "base/files/file_util.h" #include "base/run_loop.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" -#include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/drive/test_util.h" +#include "components/drive/service/fake_drive_service.h" +#include "components/drive/service/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_cache.cc b/chrome/browser/chromeos/drive/file_cache.cc index 5a03d51..b4bb205 100644 --- a/chrome/browser/chromeos/drive/file_cache.cc +++ b/chrome/browser/chromeos/drive/file_cache.cc @@ -20,8 +20,8 @@ #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/resource_metadata_storage.h" -#include "chrome/browser/drive/drive_api_util.h" #include "chromeos/chromeos_constants.h" +#include "components/drive/drive_api_util.h" #include "google_apis/drive/task_util.h" #include "net/base/filename_util.h" #include "net/base/mime_sniffer.h" diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.cc b/chrome/browser/chromeos/drive/file_system/copy_operation.cc index 4eb3b8e..0ab562c 100644 --- a/chrome/browser/chromeos/drive/file_system/copy_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/copy_operation.cc @@ -16,7 +16,7 @@ #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/drive/drive_api_util.h" +#include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc index de8008f..5b88e13 100644 --- a/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc @@ -11,8 +11,8 @@ #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" -#include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/drive/fake_drive_service.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/service/fake_drive_service.h" #include "content/public/test/test_utils.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" diff --git a/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc index a903762..ea59583 100644 --- a/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" -#include "chrome/browser/drive/fake_drive_service.h" +#include "components/drive/service/fake_drive_service.h" #include "content/public/test/test_utils.h" #include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation.cc b/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation.cc index 12f2898..53ef191 100644 --- a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation.cc @@ -13,7 +13,7 @@ #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" #include "chrome/browser/chromeos/drive/file_write_watcher.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" -#include "chrome/browser/drive/event_logger.h" +#include "components/drive/event_logger.h" #include "content/public/browser/browser_thread.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.cc b/chrome/browser/chromeos/drive/file_system/operation_test_base.cc index fbae6f5..2597de0 100644 --- a/chrome/browser/chromeos/drive/file_system/operation_test_base.cc +++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.cc @@ -13,9 +13,9 @@ #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" -#include "chrome/browser/drive/event_logger.h" -#include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/drive/test_util.h" +#include "components/drive/event_logger.h" +#include "components/drive/service/fake_drive_service.h" +#include "components/drive/service/test_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_utils.h" #include "google_apis/drive/test_util.h" diff --git a/chrome/browser/chromeos/drive/file_system/search_operation.cc b/chrome/browser/chromeos/drive/file_system/search_operation.cc index fab5936..68f9618 100644 --- a/chrome/browser/chromeos/drive/file_system/search_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/search_operation.cc @@ -16,7 +16,7 @@ #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/drive/drive_api_util.h" +#include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" #include "url/gurl.h" diff --git a/chrome/browser/chromeos/drive/file_system/search_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/search_operation_unittest.cc index cba6af9..bdeedd6 100644 --- a/chrome/browser/chromeos/drive/file_system/search_operation_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system/search_operation_unittest.cc @@ -7,7 +7,7 @@ #include "base/callback_helpers.h" #include "chrome/browser/chromeos/drive/change_list_loader.h" #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" -#include "chrome/browser/drive/fake_drive_service.h" +#include "components/drive/service/fake_drive_service.h" #include "content/public/test/test_utils.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc b/chrome/browser/chromeos/drive/file_system_unittest.cc index c9ff562..4e95338 100644 --- a/chrome/browser/chromeos/drive/file_system_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system_unittest.cc @@ -25,10 +25,10 @@ #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/drive/drive_api_util.h" -#include "chrome/browser/drive/event_logger.h" -#include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/drive/test_util.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/event_logger.h" +#include "components/drive/service/fake_drive_service.h" +#include "components/drive/service/test_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/drive_api_parser.h" diff --git a/chrome/browser/chromeos/drive/file_task_executor.cc b/chrome/browser/chromeos/drive/file_task_executor.cc index b231157..84d3dbf 100644 --- a/chrome/browser/chromeos/drive/file_task_executor.cc +++ b/chrome/browser/chromeos/drive/file_task_executor.cc @@ -11,7 +11,6 @@ #include "chrome/browser/chromeos/drive/drive_integration_service.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" #include "chrome/browser/chromeos/drive/file_system_util.h" -#include "chrome/browser/drive/drive_service_interface.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" #include "chrome/browser/ui/browser.h" @@ -19,6 +18,7 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" #include "chrome/common/extensions/api/file_manager_private.h" +#include "components/drive/service/drive_service_interface.h" #include "content/public/browser/browser_thread.h" #include "storage/browser/fileapi/file_system_url.h" diff --git a/chrome/browser/chromeos/drive/file_task_executor_unittest.cc b/chrome/browser/chromeos/drive/file_task_executor_unittest.cc index 78a2c03b..f94a88a 100644 --- a/chrome/browser/chromeos/drive/file_task_executor_unittest.cc +++ b/chrome/browser/chromeos/drive/file_task_executor_unittest.cc @@ -9,7 +9,7 @@ #include "base/run_loop.h" #include "chrome/browser/chromeos/drive/fake_file_system.h" -#include "chrome/browser/drive/fake_drive_service.h" +#include "components/drive/service/fake_drive_service.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/fileapi/file_system_backend_delegate.cc b/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc index 7999420..6e9bcc1 100644 --- a/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc +++ b/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc @@ -13,7 +13,7 @@ #include "chrome/browser/chromeos/drive/fileapi/fileapi_worker.h" #include "chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h" #include "chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.h" -#include "chrome/browser/drive/drive_api_util.h" +#include "components/drive/drive_api_util.h" #include "content/public/browser/browser_thread.h" #include "storage/browser/fileapi/async_file_util.h" #include "storage/browser/fileapi/file_stream_reader.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 3727b22..842200a 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 @@ -16,8 +16,8 @@ #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/drive/fake_drive_service.h" -#include "chrome/browser/drive/test_util.h" +#include "components/drive/service/fake_drive_service.h" +#include "components/drive/service/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/time_util.h" diff --git a/chrome/browser/chromeos/drive/job_scheduler.cc b/chrome/browser/chromeos/drive/job_scheduler.cc index fa9d9fb..cc62219 100644 --- a/chrome/browser/chromeos/drive/job_scheduler.cc +++ b/chrome/browser/chromeos/drive/job_scheduler.cc @@ -14,7 +14,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/drive/event_logger.h" +#include "components/drive/event_logger.h" #include "google_apis/drive/drive_api_parser.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/job_scheduler.h b/chrome/browser/chromeos/drive/job_scheduler.h index 39909ca..fc1be52 100644 --- a/chrome/browser/chromeos/drive/job_scheduler.h +++ b/chrome/browser/chromeos/drive/job_scheduler.h @@ -14,8 +14,8 @@ #include "base/threading/thread_checker.h" #include "chrome/browser/chromeos/drive/job_list.h" #include "chrome/browser/chromeos/drive/job_queue.h" -#include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/drive/drive_uploader.h" +#include "components/drive/drive_uploader.h" +#include "components/drive/service/drive_service_interface.h" #include "net/base/network_change_notifier.h" class PrefService; diff --git a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc index e36636d..e3fb900 100644 --- a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc +++ b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc @@ -17,9 +17,9 @@ #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/drive_pref_names.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" +#include "components/drive/event_logger.h" +#include "components/drive/service/fake_drive_service.h" +#include "components/drive/service/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/resource_entry_conversion.cc b/chrome/browser/chromeos/drive/resource_entry_conversion.cc index af71a89..ba23fbe0 100644 --- a/chrome/browser/chromeos/drive/resource_entry_conversion.cc +++ b/chrome/browser/chromeos/drive/resource_entry_conversion.cc @@ -10,7 +10,7 @@ #include "base/time/time.h" #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" -#include "chrome/browser/drive/drive_api_util.h" +#include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc b/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc index e6e35a1..78b357d 100644 --- a/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_entry_conversion_unittest.cc @@ -6,7 +6,7 @@ #include "base/time/time.h" #include "chrome/browser/chromeos/drive/drive.pb.h" -#include "chrome/browser/drive/drive_api_util.h" +#include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/resource_metadata_storage.cc b/chrome/browser/chromeos/drive/resource_metadata_storage.cc index 8322a77..3b43091 100644 --- a/chrome/browser/chromeos/drive/resource_metadata_storage.cc +++ b/chrome/browser/chromeos/drive/resource_metadata_storage.cc @@ -17,7 +17,7 @@ #include "base/sequenced_task_runner.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/chromeos/drive/drive.pb.h" -#include "chrome/browser/drive/drive_api_util.h" +#include "components/drive/drive_api_util.h" #include "third_party/leveldatabase/env_chromium.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" #include "third_party/leveldatabase/src/include/leveldb/write_batch.h" diff --git a/chrome/browser/chromeos/drive/search_metadata.cc b/chrome/browser/chromeos/drive/search_metadata.cc index 5c25d91..e057ce3 100644 --- a/chrome/browser/chromeos/drive/search_metadata.cc +++ b/chrome/browser/chromeos/drive/search_metadata.cc @@ -13,7 +13,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" -#include "chrome/browser/drive/drive_api_util.h" +#include "components/drive/drive_api_util.h" #include "net/base/escape.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/search_metadata_unittest.cc b/chrome/browser/chromeos/drive/search_metadata_unittest.cc index feb1da6..0dd707c 100644 --- a/chrome/browser/chromeos/drive/search_metadata_unittest.cc +++ b/chrome/browser/chromeos/drive/search_metadata_unittest.cc @@ -15,7 +15,7 @@ #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/drive/drive_api_util.h" +#include "components/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/entry_revert_performer.cc b/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc index d14e06b..4506929 100644 --- a/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc +++ b/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc @@ -11,7 +11,7 @@ #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/drive/drive_api_util.h" +#include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/sync/entry_revert_performer_unittest.cc b/chrome/browser/chromeos/drive/sync/entry_revert_performer_unittest.cc index 1db3d87..6bdcad7 100644 --- a/chrome/browser/chromeos/drive/sync/entry_revert_performer_unittest.cc +++ b/chrome/browser/chromeos/drive/sync/entry_revert_performer_unittest.cc @@ -10,7 +10,7 @@ #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/drive/fake_drive_service.h" +#include "components/drive/service/fake_drive_service.h" #include "content/public/test/test_utils.h" #include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc b/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc index 7b6bbf2..68d8ccd 100644 --- a/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc +++ b/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc @@ -13,8 +13,8 @@ #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" -#include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/drive/fake_drive_service.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/service/fake_drive_service.h" #include "content/public/test/test_utils.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" diff --git a/chrome/browser/chromeos/drive/sync/remove_performer.cc b/chrome/browser/chromeos/drive/sync/remove_performer.cc index fc79549..57b089c 100644 --- a/chrome/browser/chromeos/drive/sync/remove_performer.cc +++ b/chrome/browser/chromeos/drive/sync/remove_performer.cc @@ -12,7 +12,7 @@ #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" #include "chrome/browser/chromeos/drive/sync/entry_revert_performer.h" -#include "chrome/browser/drive/drive_api_util.h" +#include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/sync/remove_performer_unittest.cc b/chrome/browser/chromeos/drive/sync/remove_performer_unittest.cc index dd6f2a0..98b0ce0 100644 --- a/chrome/browser/chromeos/drive/sync/remove_performer_unittest.cc +++ b/chrome/browser/chromeos/drive/sync/remove_performer_unittest.cc @@ -9,7 +9,7 @@ #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/drive/fake_drive_service.h" +#include "components/drive/service/fake_drive_service.h" #include "content/public/test/test_utils.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" diff --git a/chrome/browser/chromeos/drive/sync_client_unittest.cc b/chrome/browser/chromeos/drive/sync_client_unittest.cc index 4c2b6db..b911572 100644 --- a/chrome/browser/chromeos/drive/sync_client_unittest.cc +++ b/chrome/browser/chromeos/drive/sync_client_unittest.cc @@ -26,8 +26,8 @@ #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/drive/event_logger.h" -#include "chrome/browser/drive/fake_drive_service.h" +#include "components/drive/event_logger.h" +#include "components/drive/service/fake_drive_service.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/extensions/file_manager/DEPS b/chrome/browser/chromeos/extensions/file_manager/DEPS new file mode 100644 index 0000000..cdad3c2 --- /dev/null +++ b/chrome/browser/chromeos/extensions/file_manager/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+components/drive", +] diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.cc b/chrome/browser/chromeos/extensions/file_manager/event_router.cc index b53e94a..5c625b2 100644 --- a/chrome/browser/chromeos/extensions/file_manager/event_router.cc +++ b/chrome/browser/chromeos/extensions/file_manager/event_router.cc @@ -26,7 +26,6 @@ #include "chrome/browser/chromeos/file_manager/volume_manager.h" #include "chrome/browser/chromeos/login/lock/screen_locker.h" #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" -#include "chrome/browser/drive/drive_service_interface.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_util.h" @@ -38,6 +37,7 @@ #include "chromeos/login/login_state.h" #include "chromeos/network/network_handler.h" #include "chromeos/network/network_state_handler.h" +#include "components/drive/service/drive_service_interface.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/storage_partition.h" diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.h b/chrome/browser/chromeos/extensions/file_manager/event_router.h index 11ec1b2..7f469ce 100644 --- a/chrome/browser/chromeos/extensions/file_manager/event_router.h +++ b/chrome/browser/chromeos/extensions/file_manager/event_router.h @@ -22,10 +22,10 @@ #include "chrome/browser/chromeos/file_manager/fileapi_util.h" #include "chrome/browser/chromeos/file_manager/volume_manager.h" #include "chrome/browser/chromeos/file_manager/volume_manager_observer.h" -#include "chrome/browser/drive/drive_service_interface.h" #include "chrome/common/extensions/api/file_manager_private.h" #include "chromeos/disks/disk_mount_manager.h" #include "chromeos/network/network_state_handler_observer.h" +#include "components/drive/service/drive_service_interface.h" #include "components/keyed_service/core/keyed_service.h" #include "storage/browser/fileapi/file_system_operation.h" diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_base.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_base.cc index b651880..68e1246 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_base.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_base.cc @@ -6,7 +6,7 @@ #include "base/strings/string_number_conversions.h" #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h" -#include "chrome/browser/drive/event_logger.h" +#include "components/drive/event_logger.h" namespace extensions { namespace { diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc index cd25169..9688d17 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc @@ -20,8 +20,6 @@ #include "chrome/browser/chromeos/fileapi/external_file_url_util.h" #include "chrome/browser/chromeos/fileapi/file_system_backend.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" -#include "chrome/browser/drive/drive_app_registry.h" -#include "chrome/browser/drive/event_logger.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" @@ -30,6 +28,8 @@ #include "chromeos/chromeos_switches.h" #include "chromeos/network/network_handler.h" #include "chromeos/network/network_state_handler.h" +#include "components/drive/drive_app_registry.h" +#include "components/drive/event_logger.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc index 43f3921..fd300ab 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc @@ -26,8 +26,6 @@ #include "chrome/browser/chromeos/file_manager/path_util.h" #include "chrome/browser/chromeos/file_manager/volume_manager.h" #include "chrome/browser/chromeos/fileapi/file_system_backend.h" -#include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/drive/event_logger.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" #include "chrome/browser/profiles/profile.h" @@ -35,6 +33,8 @@ #include "chrome/common/extensions/api/file_manager_private.h" #include "chrome/common/extensions/api/file_manager_private_internal.h" #include "chromeos/disks/disk_mount_manager.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/event_logger.h" #include "components/storage_monitor/storage_info.h" #include "components/storage_monitor/storage_monitor.h" #include "content/public/browser/child_process_security_policy.h" diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc index 0b26c71..a2f5624 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc @@ -24,7 +24,6 @@ #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/devtools/devtools_window.h" -#include "chrome/browser/drive/event_logger.h" #include "chrome/browser/extensions/api/file_handlers/mime_util.h" #include "chrome/browser/extensions/devtools_util.h" #include "chrome/browser/lifetime/application_lifetime.h" @@ -39,6 +38,7 @@ #include "chrome/common/extensions/api/file_manager_private_internal.h" #include "chrome/common/extensions/api/manifest_types.h" #include "chrome/common/pref_names.h" +#include "components/drive/event_logger.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/user_manager/user_manager.h" diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc index 3093a0a..44c00aa 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc @@ -14,10 +14,10 @@ #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h" #include "chrome/browser/chromeos/file_manager/fileapi_util.h" #include "chrome/browser/chromeos/file_manager/volume_manager.h" -#include "chrome/browser/drive/event_logger.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/file_manager_private.h" #include "chromeos/disks/disk_mount_manager.h" +#include "components/drive/event_logger.h" #include "content/public/browser/browser_thread.h" #include "google_apis/drive/task_util.h" #include "ui/shell_dialogs/selected_file_info.h" diff --git a/chrome/browser/chromeos/file_manager/DEPS b/chrome/browser/chromeos/file_manager/DEPS new file mode 100644 index 0000000..f46949c --- /dev/null +++ b/chrome/browser/chromeos/file_manager/DEPS @@ -0,0 +1,4 @@ +include_rules = [ + "+components/drive", +] + diff --git a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc index c4cbcc7..fd2d19e 100644 --- a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc +++ b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc @@ -13,13 +13,13 @@ #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" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" +#include "components/drive/service/fake_drive_service.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/notification_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 11f0dc8..2ed55c3 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc @@ -18,12 +18,12 @@ #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" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/common/chrome_switches.h" #include "chromeos/chromeos_switches.h" +#include "components/drive/service/fake_drive_service.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" #include "extensions/browser/api/test/test_api.h" diff --git a/chrome/browser/chromeos/file_manager/file_tasks.cc b/chrome/browser/chromeos/file_manager/file_tasks.cc index 6d10e9c..73757b3 100644 --- a/chrome/browser/chromeos/file_manager/file_tasks.cc +++ b/chrome/browser/chromeos/file_manager/file_tasks.cc @@ -16,8 +16,6 @@ #include "chrome/browser/chromeos/file_manager/file_browser_handlers.h" #include "chrome/browser/chromeos/file_manager/fileapi_util.h" #include "chrome/browser/chromeos/file_manager/open_util.h" -#include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/drive/drive_app_registry.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" @@ -28,6 +26,8 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" #include "chromeos/chromeos_switches.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/drive_app_registry.h" #include "components/mime_util/mime_util.h" #include "extensions/browser/extension_host.h" #include "extensions/browser/extension_registry.h" diff --git a/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc b/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc index ed00981..b1d6846 100644 --- a/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc +++ b/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc @@ -16,11 +16,11 @@ #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/device_settings_service.h" -#include "chrome/browser/drive/drive_app_registry.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" +#include "components/drive/drive_app_registry.h" #include "content/public/test/test_browser_thread_bundle.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_system.h" diff --git a/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc b/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc index a7065db..c4ce763 100644 --- a/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc +++ b/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc @@ -7,11 +7,11 @@ #include "chrome/browser/chromeos/drive/fake_file_system.h" #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" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" +#include "components/drive/service/fake_drive_service.h" +#include "components/drive/service/test_util.h" #include "content/public/browser/storage_partition.h" #include "content/public/common/file_chooser_file_info.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/chromeos/file_manager/open_with_browser.cc b/chrome/browser/chromeos/file_manager/open_with_browser.cc index ba9c10f..7ac3e3d 100644 --- a/chrome/browser/chromeos/file_manager/open_with_browser.cc +++ b/chrome/browser/chromeos/file_manager/open_with_browser.cc @@ -13,7 +13,6 @@ #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/file_manager/filesystem_api_util.h" #include "chrome/browser/chromeos/fileapi/external_file_url_util.h" -#include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" @@ -24,6 +23,7 @@ #include "chrome/common/chrome_content_client.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" +#include "components/drive/drive_api_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/plugin_service.h" #include "content/public/common/pepper_plugin_info.h" diff --git a/chrome/browser/chromeos/fileapi/DEPS b/chrome/browser/chromeos/fileapi/DEPS new file mode 100644 index 0000000..f335284 --- /dev/null +++ b/chrome/browser/chromeos/fileapi/DEPS @@ -0,0 +1,5 @@ +specific_include_rules = { + ".*_unittest\.cc": [ + "+components/drive" + ], +} 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 658f810..9c161ce 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 @@ -15,14 +15,14 @@ #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/drive/fake_drive_service.h" -#include "chrome/browser/drive/test_util.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" +#include "components/drive/service/fake_drive_service.h" +#include "components/drive/service/test_util.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/pref_registry/testing_pref_service_syncable.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/drive/DEPS b/chrome/browser/drive/DEPS index 8877482..ac52916 100644 --- a/chrome/browser/drive/DEPS +++ b/chrome/browser/drive/DEPS @@ -1,20 +1,5 @@ include_rules = [ - "-chrome", - "-content", - "+chrome/browser/drive", - "+components/invalidation", + "+components/keyed_service", + "+components/drive", ] -# The following dependencies should be removed to componentize this -# directory. crbug.com/257943 -specific_include_rules = { - "drive_notification_manager_factory\.cc": [ - "!chrome/browser/invalidation/profile_invalidation_provider_factory.h", - "!chrome/browser/profiles/profile.h", - "!chrome/browser/sync/profile_sync_service.h", - "!chrome/browser/sync/profile_sync_service_factory.h", - ], - "drive_uploader\.cc": [ - "!content/public/browser/power_save_blocker.h", - ], -} diff --git a/chrome/browser/drive/README b/chrome/browser/drive/README index beaedae..caf10d0 100644 --- a/chrome/browser/drive/README +++ b/chrome/browser/drive/README @@ -1,3 +1,4 @@ -This directory contains utility code for accessing Google Drive, shared by -SyncFileSystem (chrome/browser/sync_file_system) and Google Drive integration -on Chrome OS (chrome/browser/chromeos/drive). +This directory contains left-behind, browser-dependent parts of +components/drive/service. These parts should probably be moved +somewhere else - chrome/browser/chromeos/drive is one possible +destination, but it is ChromeOS-specific. See crbug.com/257943. diff --git a/chrome/browser/drive/drive_notification_manager_factory.cc b/chrome/browser/drive/drive_notification_manager_factory.cc index 51cda01..8575d9a 100644 --- a/chrome/browser/drive/drive_notification_manager_factory.cc +++ b/chrome/browser/drive/drive_notification_manager_factory.cc @@ -5,11 +5,11 @@ #include "chrome/browser/drive/drive_notification_manager_factory.h" #include "base/logging.h" -#include "chrome/browser/drive/drive_notification_manager.h" #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" +#include "components/drive/drive_notification_manager.h" #include "components/invalidation/impl/profile_invalidation_provider.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" diff --git a/chrome/browser/extensions/api/file_system/DEPS b/chrome/browser/extensions/api/file_system/DEPS index c907974..ba53f4d 100644 --- a/chrome/browser/extensions/api/file_system/DEPS +++ b/chrome/browser/extensions/api/file_system/DEPS @@ -1,3 +1,9 @@ include_rules = [ "+components/constrained_window", ] + +specific_include_rules = { + "file_system_apitest_chromeos\.cc": [ + "+components/drive" + ], +} diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc index c18938d..a213397 100644 --- a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc +++ b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc @@ -18,10 +18,10 @@ #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" -#include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/api/file_system.h" +#include "components/drive/service/fake_drive_service.h" #include "content/public/test/test_utils.h" #include "extensions/browser/event_router.h" #include "google_apis/drive/drive_api_parser.h" diff --git a/chrome/browser/extensions/api/sync_file_system/DEPS b/chrome/browser/extensions/api/sync_file_system/DEPS new file mode 100644 index 0000000..73bc109 --- /dev/null +++ b/chrome/browser/extensions/api/sync_file_system/DEPS @@ -0,0 +1,5 @@ +specific_include_rules = { + "sync_file_system_browsertest\.cc": [ + "+components/drive" + ], +} diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc index d3e3c42..6777561 100644 --- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc +++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc @@ -7,13 +7,13 @@ #include "base/thread_task_runner_handle.h" #include "base/values.h" #include "chrome/browser/apps/app_browsertest_util.h" -#include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/signin/fake_signin_manager.h" #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h" #include "chrome/browser/sync_file_system/local/local_file_sync_service.h" #include "chrome/browser/sync_file_system/sync_file_system_service.h" #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h" +#include "components/drive/service/fake_drive_service.h" #include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "storage/browser/quota/quota_manager.h" diff --git a/chrome/browser/sync_file_system/DEPS b/chrome/browser/sync_file_system/DEPS new file mode 100644 index 0000000..cdad3c2 --- /dev/null +++ b/chrome/browser/sync_file_system/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+components/drive", +] diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc index 59ebf29..3a9e673 100644 --- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc +++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc @@ -9,9 +9,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/strings/stringprintf.h" -#include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/drive/drive_uploader.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" @@ -19,6 +16,9 @@ #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h" #include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h" #include "chrome/browser/sync_file_system/logger.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/drive_uploader.h" +#include "components/drive/service/drive_service_interface.h" #include "google_apis/drive/drive_api_parser.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc index 84ffaf1..64dc3ec 100644 --- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc @@ -10,8 +10,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" -#include "chrome/browser/drive/drive_uploader.h" -#include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.h" #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.h" @@ -27,6 +25,8 @@ #include "chrome/browser/sync_file_system/fake_remote_change_processor.h" #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" +#include "components/drive/drive_uploader.h" +#include "components/drive/service/fake_drive_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/drive_api_error_codes.h" #include "google_apis/drive/drive_api_parser.h" diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc index ce49be9..110a6d4 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc @@ -9,9 +9,6 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" -#include "chrome/browser/drive/drive_uploader.h" -#include "chrome/browser/drive/fake_drive_service.h" -#include "chrome/browser/drive/test_util.h" #include "chrome/browser/sync_file_system/drive_backend/callback_helper.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.h" @@ -27,6 +24,9 @@ #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" #include "chrome/test/base/testing_profile.h" +#include "components/drive/drive_uploader.h" +#include "components/drive/service/fake_drive_service.h" +#include "components/drive/service/test_util.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc index 3cad47c..2904e26 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc +++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc @@ -7,10 +7,10 @@ #include <set> #include <string> -#include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" +#include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc index 6922bbd..27d08df 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc +++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc @@ -9,11 +9,11 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/threading/thread_restrictions.h" -#include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" #include "chrome/browser/sync_file_system/logger.h" +#include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" #include "third_party/leveldatabase/src/include/leveldb/status.h" diff --git a/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h b/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h index ed4e72c..57eafe7 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h +++ b/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.h @@ -8,7 +8,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" -#include "chrome/browser/drive/drive_service_interface.h" +#include "components/drive/service/drive_service_interface.h" namespace base { class SingleThreadTaskRunner; diff --git a/chrome/browser/sync_file_system/drive_backend/drive_service_wrapper.cc b/chrome/browser/sync_file_system/drive_backend/drive_service_wrapper.cc index c89a5e5..534f244 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_service_wrapper.cc +++ b/chrome/browser/sync_file_system/drive_backend/drive_service_wrapper.cc @@ -7,7 +7,7 @@ #include <string> #include "base/memory/weak_ptr.h" -#include "chrome/browser/drive/drive_service_interface.h" +#include "components/drive/service/drive_service_interface.h" namespace sync_file_system { namespace drive_backend { diff --git a/chrome/browser/sync_file_system/drive_backend/drive_service_wrapper.h b/chrome/browser/sync_file_system/drive_backend/drive_service_wrapper.h index ce3ee88..fa7160e 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_service_wrapper.h +++ b/chrome/browser/sync_file_system/drive_backend/drive_service_wrapper.h @@ -7,7 +7,7 @@ #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" -#include "chrome/browser/drive/drive_service_interface.h" +#include "components/drive/service/drive_service_interface.h" namespace sync_file_system { namespace drive_backend { diff --git a/chrome/browser/sync_file_system/drive_backend/drive_uploader_on_worker.h b/chrome/browser/sync_file_system/drive_backend/drive_uploader_on_worker.h index caa87e8..cfd2c39 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_uploader_on_worker.h +++ b/chrome/browser/sync_file_system/drive_backend/drive_uploader_on_worker.h @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" -#include "chrome/browser/drive/drive_uploader.h" +#include "components/drive/drive_uploader.h" namespace base { class SingleThreadTaskRunner; diff --git a/chrome/browser/sync_file_system/drive_backend/drive_uploader_wrapper.cc b/chrome/browser/sync_file_system/drive_backend/drive_uploader_wrapper.cc index 77f065f..70fcbf1 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_uploader_wrapper.cc +++ b/chrome/browser/sync_file_system/drive_backend/drive_uploader_wrapper.cc @@ -5,7 +5,7 @@ #include "chrome/browser/sync_file_system/drive_backend/drive_uploader_wrapper.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/drive/drive_uploader.h" +#include "components/drive/drive_uploader.h" namespace sync_file_system { namespace drive_backend { diff --git a/chrome/browser/sync_file_system/drive_backend/drive_uploader_wrapper.h b/chrome/browser/sync_file_system/drive_backend/drive_uploader_wrapper.h index 49f7bfb..4bdd548 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_uploader_wrapper.h +++ b/chrome/browser/sync_file_system/drive_backend/drive_uploader_wrapper.h @@ -7,7 +7,7 @@ #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" -#include "chrome/browser/drive/drive_uploader.h" +#include "components/drive/drive_uploader.h" namespace sync_file_system { namespace drive_backend { diff --git a/chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.h b/chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.h index f5b4cd8b..929f385 100644 --- a/chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.h +++ b/chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.h @@ -8,8 +8,8 @@ #include <string> #include "base/files/scoped_temp_dir.h" -#include "chrome/browser/drive/drive_uploader.h" -#include "chrome/browser/drive/fake_drive_service.h" +#include "components/drive/drive_uploader.h" +#include "components/drive/service/fake_drive_service.h" namespace base { class FilePath; diff --git a/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h b/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h index b14ba2b..da79223 100644 --- a/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h +++ b/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h @@ -10,9 +10,9 @@ #include "base/files/file_util.h" #include "base/strings/stringprintf.h" #include "base/values.h" -#include "chrome/browser/drive/drive_uploader.h" -#include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.h" +#include "components/drive/drive_uploader.h" +#include "components/drive/service/fake_drive_service.h" #include "google_apis/drive/drive_api_error_codes.h" #include "google_apis/drive/test_util.h" #include "net/base/escape.h" diff --git a/chrome/browser/sync_file_system/drive_backend/folder_creator.cc b/chrome/browser/sync_file_system/drive_backend/folder_creator.cc index 252b1c7..8e1c800 100644 --- a/chrome/browser/sync_file_system/drive_backend/folder_creator.cc +++ b/chrome/browser/sync_file_system/drive_backend/folder_creator.cc @@ -4,10 +4,10 @@ #include "chrome/browser/sync_file_system/drive_backend/folder_creator.h" -#include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/drive/drive_service_interface.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/service/drive_service_interface.h" #include "google_apis/drive/drive_api_parser.h" namespace drive { diff --git a/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc b/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc index 3b52e9e..783ca26 100644 --- a/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc +++ b/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc @@ -10,7 +10,6 @@ #include "base/format_macros.h" #include "base/location.h" #include "base/strings/stringprintf.h" -#include "chrome/browser/drive/drive_service_interface.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" @@ -19,6 +18,7 @@ #include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h" #include "chrome/browser/sync_file_system/logger.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" +#include "components/drive/service/drive_service_interface.h" #include "google_apis/drive/drive_api_parser.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc index d551420..7280f5e 100644 --- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc +++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc @@ -14,9 +14,6 @@ #include "base/sequenced_task_runner.h" #include "base/strings/stringprintf.h" #include "base/task_runner_util.h" -#include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/drive/drive_uploader.h" #include "chrome/browser/sync_file_system/drive_backend/callback_helper.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" @@ -27,6 +24,9 @@ #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h" #include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h" #include "chrome/browser/sync_file_system/logger.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/drive_uploader.h" +#include "components/drive/service/drive_service_interface.h" #include "google_apis/drive/drive_api_parser.h" #include "net/base/mime_util.h" #include "storage/common/fileapi/file_system_util.h" diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc index 9364d1c..89bd5a3 100644 --- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc @@ -10,9 +10,6 @@ #include "base/logging.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" -#include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/drive/drive_uploader.h" -#include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.h" #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.h" @@ -28,6 +25,9 @@ #include "chrome/browser/sync_file_system/fake_remote_change_processor.h" #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/drive_uploader.h" +#include "components/drive/service/fake_drive_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/drive_api_error_codes.h" #include "google_apis/drive/drive_api_parser.h" diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc index 0859ba1..f23471f 100644 --- a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc +++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc @@ -21,7 +21,6 @@ #include "base/task_runner_util.h" #include "base/thread_task_runner_handle.h" #include "base/threading/thread_restrictions.h" -#include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" #include "chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.h" @@ -32,6 +31,7 @@ #include "chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util.h" #include "chrome/browser/sync_file_system/logger.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" +#include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" #include "storage/common/fileapi/file_system_util.h" #include "third_party/leveldatabase/env_chromium.h" diff --git a/chrome/browser/sync_file_system/drive_backend/register_app_task.cc b/chrome/browser/sync_file_system/drive_backend/register_app_task.cc index c2215aa..cc2249b 100644 --- a/chrome/browser/sync_file_system/drive_backend/register_app_task.cc +++ b/chrome/browser/sync_file_system/drive_backend/register_app_task.cc @@ -6,8 +6,6 @@ #include "base/bind.h" #include "base/location.h" -#include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/drive/drive_service_interface.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/folder_creator.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" @@ -15,6 +13,8 @@ #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" #include "chrome/browser/sync_file_system/drive_backend/tracker_id_set.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/service/drive_service_interface.h" #include "google_apis/drive/drive_api_parser.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc index 1de4b37..7c3b0aa 100644 --- a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc @@ -12,8 +12,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h" -#include "chrome/browser/drive/drive_uploader.h" -#include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.h" @@ -22,6 +20,8 @@ #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" +#include "components/drive/drive_uploader.h" +#include "components/drive/service/fake_drive_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/drive_api_parser.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc index f91ffca..b93728d 100644 --- a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc +++ b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc @@ -12,8 +12,6 @@ #include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/task_runner_util.h" -#include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/drive/drive_service_interface.h" #include "chrome/browser/sync_file_system/drive_backend/callback_helper.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" @@ -23,6 +21,8 @@ #include "chrome/browser/sync_file_system/drive_backend/task_dependency_manager.h" #include "chrome/browser/sync_file_system/logger.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/service/drive_service_interface.h" #include "extensions/common/extension.h" #include "google_apis/drive/drive_api_parser.h" #include "storage/common/fileapi/file_system_util.h" diff --git a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc index 0541e95..3cd033e0 100644 --- a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc @@ -12,8 +12,6 @@ #include "base/logging.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" -#include "chrome/browser/drive/drive_uploader.h" -#include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.h" #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.h" @@ -26,6 +24,8 @@ #include "chrome/browser/sync_file_system/fake_remote_change_processor.h" #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" +#include "components/drive/drive_uploader.h" +#include "components/drive/service/fake_drive_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/drive_api_error_codes.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc index 890cfed..af08422 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc @@ -12,11 +12,7 @@ #include "base/threading/sequenced_worker_pool.h" #include "base/time/time.h" #include "base/values.h" -#include "chrome/browser/drive/drive_api_service.h" -#include "chrome/browser/drive/drive_notification_manager.h" #include "chrome/browser/drive/drive_notification_manager_factory.h" -#include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/drive/drive_uploader.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" @@ -44,6 +40,10 @@ #include "chrome/browser/sync_file_system/file_status_observer.h" #include "chrome/browser/sync_file_system/logger.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" +#include "components/drive/drive_notification_manager.h" +#include "components/drive/drive_uploader.h" +#include "components/drive/service/drive_api_service.h" +#include "components/drive/service/drive_service_interface.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.h b/chrome/browser/sync_file_system/drive_backend/sync_engine.h index fc583f7..720993e 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine.h +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.h @@ -11,13 +11,13 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "chrome/browser/drive/drive_notification_observer.h" -#include "chrome/browser/drive/drive_service_interface.h" #include "chrome/browser/sync_file_system/drive_backend/callback_tracker.h" #include "chrome/browser/sync_file_system/local_change_processor.h" #include "chrome/browser/sync_file_system/remote_file_sync_service.h" #include "chrome/browser/sync_file_system/sync_action.h" #include "chrome/browser/sync_file_system/sync_direction.h" +#include "components/drive/drive_notification_observer.h" +#include "components/drive/service/drive_service_interface.h" #include "components/signin/core/browser/signin_manager_base.h" #include "net/base/network_change_notifier.h" diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_context.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_context.cc index e487003..16f2c01 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine_context.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_context.cc @@ -9,11 +9,11 @@ #include "base/memory/scoped_ptr.h" #include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" -#include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/drive/drive_uploader.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "chrome/browser/sync_file_system/remote_change_processor.h" #include "chrome/browser/sync_file_system/task_logger.h" +#include "components/drive/drive_uploader.h" +#include "components/drive/service/drive_service_interface.h" namespace sync_file_system { namespace drive_backend { diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc index 0b7216e..1bf3195 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc @@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/callback.h" #include "base/logging.h" -#include "chrome/browser/drive/drive_api_service.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" @@ -15,6 +14,7 @@ #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h" #include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h" #include "chrome/browser/sync_file_system/logger.h" +#include "components/drive/service/drive_api_service.h" #include "google_apis/drive/drive_api_parser.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc index f4b3c25..650134c 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc @@ -8,9 +8,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" -#include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/drive/drive_uploader.h" -#include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" @@ -18,6 +15,9 @@ #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h" #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/drive_uploader.h" +#include "components/drive/service/fake_drive_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/drive_api_parser.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc index 8bab99c..13cc2c1 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc @@ -8,13 +8,13 @@ #include "base/macros.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" -#include "chrome/browser/drive/drive_uploader.h" -#include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/sync_file_system/drive_backend/callback_helper.h" #include "chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h" #include "chrome/browser/sync_file_system/drive_backend/sync_worker_interface.h" #include "chrome/browser/sync_file_system/remote_file_sync_service.h" #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" +#include "components/drive/drive_uploader.h" +#include "components/drive/service/fake_drive_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/sync_file_system/drive_backend/sync_worker.cc b/chrome/browser/sync_file_system/drive_backend/sync_worker.cc index e73ad16..1cb1c4e 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_worker.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_worker.cc @@ -7,7 +7,6 @@ #include <vector> #include "base/bind.h" -#include "chrome/browser/drive/drive_service_interface.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/sync_file_system/drive_backend/callback_helper.h" #include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h" @@ -24,6 +23,7 @@ #include "chrome/browser/sync_file_system/drive_backend/uninstall_app_task.h" #include "chrome/browser/sync_file_system/logger.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" +#include "components/drive/service/drive_service_interface.h" #include "storage/common/fileapi/file_system_util.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc index 7842863..196313d 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc @@ -10,8 +10,6 @@ #include "base/single_thread_task_runner.h" #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h" -#include "chrome/browser/drive/drive_uploader.h" -#include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/extensions/test_extension_service.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" @@ -19,6 +17,8 @@ #include "chrome/browser/sync_file_system/drive_backend/sync_task.h" #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h" #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" +#include "components/drive/drive_uploader.h" +#include "components/drive/service/fake_drive_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" diff --git a/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.cc b/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.cc index 179cc94..1a5bf6f 100644 --- a/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.cc +++ b/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.cc @@ -6,8 +6,6 @@ #include "base/bind.h" #include "base/location.h" -#include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/drive/drive_service_interface.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" @@ -15,6 +13,8 @@ #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" #include "chrome/browser/sync_file_system/drive_backend/tracker_id_set.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/service/drive_service_interface.h" #include "google_apis/drive/drive_api_parser.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/logger.cc b/chrome/browser/sync_file_system/logger.cc index 252b9e9..89b39e1 100644 --- a/chrome/browser/sync_file_system/logger.cc +++ b/chrome/browser/sync_file_system/logger.cc @@ -8,7 +8,7 @@ #include "base/lazy_instance.h" #include "base/location.h" #include "base/strings/stringprintf.h" -#include "chrome/browser/drive/event_logger.h" +#include "components/drive/event_logger.h" namespace sync_file_system { namespace util { diff --git a/chrome/browser/sync_file_system/logger.h b/chrome/browser/sync_file_system/logger.h index 0bea1ca..ad011de 100644 --- a/chrome/browser/sync_file_system/logger.h +++ b/chrome/browser/sync_file_system/logger.h @@ -10,7 +10,7 @@ #include "base/location.h" #include "base/logging.h" -#include "chrome/browser/drive/event_logger.h" +#include "components/drive/event_logger.h" namespace sync_file_system { // Originally wanted to use 'logging' here, but it conflicts with diff --git a/chrome/browser/ui/webui/chromeos/DEPS b/chrome/browser/ui/webui/chromeos/DEPS index a571d4c..9175df1 100644 --- a/chrome/browser/ui/webui/chromeos/DEPS +++ b/chrome/browser/ui/webui/chromeos/DEPS @@ -3,3 +3,9 @@ include_rules = [ "+components/user_manager", "+media/audio/sounds", ] + +specific_include_rules = { + "drive_internals_ui\.cc": [ + "+components/drive" + ], +} diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc index a622860..7682d73 100644 --- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc +++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc @@ -21,14 +21,14 @@ #include "chrome/browser/chromeos/drive/file_system_util.h" #include "chrome/browser/chromeos/drive/job_list.h" #include "chrome/browser/chromeos/file_manager/path_util.h" -#include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/drive/drive_notification_manager.h" #include "chrome/browser/drive/drive_notification_manager_factory.h" -#include "chrome/browser/drive/drive_service_interface.h" -#include "chrome/browser/drive/event_logger.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/drive_notification_manager.h" +#include "components/drive/event_logger.h" +#include "components/drive/service/drive_service_interface.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" diff --git a/chrome/browser/ui/webui/sync_file_system_internals/DEPS b/chrome/browser/ui/webui/sync_file_system_internals/DEPS new file mode 100644 index 0000000..cdad3c2 --- /dev/null +++ b/chrome/browser/ui/webui/sync_file_system_internals/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+components/drive", +] diff --git a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc index cfeebdc..bfe466a 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc +++ b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/values.h" -#include "chrome/browser/drive/drive_notification_manager.h" #include "chrome/browser/drive/drive_notification_manager_factory.h" #include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h" #include "chrome/browser/profiles/profile.h" @@ -18,6 +17,7 @@ #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h" #include "chrome/browser/sync_file_system/sync_service_state.h" #include "chrome/common/extensions/api/sync_file_system.h" +#include "components/drive/drive_notification_manager.h" #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_ui.h" #include "google_apis/drive/time_util.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index cc96bf1..8630dc7 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1431,24 +1431,8 @@ 'browser/autocomplete/keyword_extensions_delegate_impl.h', 'browser/content_settings/content_settings_internal_extension_provider.cc', 'browser/content_settings/content_settings_internal_extension_provider.h', - 'browser/drive/drive_api_service.cc', - 'browser/drive/drive_api_service.h', - 'browser/drive/drive_api_util.cc', - 'browser/drive/drive_api_util.h', - 'browser/drive/drive_app_registry.cc', - 'browser/drive/drive_app_registry.h', - 'browser/drive/drive_app_registry_observer.h', - 'browser/drive/drive_notification_manager.cc', - 'browser/drive/drive_notification_manager.h', 'browser/drive/drive_notification_manager_factory.cc', 'browser/drive/drive_notification_manager_factory.h', - 'browser/drive/drive_notification_observer.h', - 'browser/drive/drive_service_interface.cc', - 'browser/drive/drive_service_interface.h', - 'browser/drive/drive_uploader.cc', - 'browser/drive/drive_uploader.h', - 'browser/drive/event_logger.cc', - 'browser/drive/event_logger.h', 'browser/guest_view/app_view/chrome_app_view_guest_delegate.cc', 'browser/guest_view/app_view/chrome_app_view_guest_delegate.h', 'browser/guest_view/extension_options/chrome_extension_options_guest_delegate.cc', @@ -3430,6 +3414,7 @@ 'common/extensions/api/api.gyp:chrome_api', 'sync_file_system_drive_proto', '../components/components.gyp:cryptauth', + '../components/components.gyp:drive', '../media/cast/cast.gyp:cast_net', ], 'sources': [ '<@(chrome_browser_extensions_sources)' ], diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 2a4d8358..a3d4dc6 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -623,17 +623,17 @@ ], 'chrome_unit_tests_extensions_sources': [ '../apps/saved_files_service_unittest.cc', + '../components/drive/drive_api_util_unittest.cc', + '../components/drive/drive_app_registry_unittest.cc', + '../components/drive/drive_uploader_unittest.cc', + '../components/drive/event_logger_unittest.cc', + '../components/drive/service/drive_api_service_unittest.cc', + '../components/drive/service/fake_drive_service_unittest.cc', 'browser/apps/app_shim/app_shim_host_mac_unittest.cc', 'browser/apps/app_shim/extension_app_shim_handler_mac_unittest.cc', 'browser/apps/drive/drive_app_mapping_unittest.cc', 'browser/apps/ephemeral_app_service_unittest.cc', 'browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc', - 'browser/drive/drive_api_service_unittest.cc', - 'browser/drive/drive_api_util_unittest.cc', - 'browser/drive/drive_app_registry_unittest.cc', - 'browser/drive/drive_uploader_unittest.cc', - 'browser/drive/event_logger_unittest.cc', - 'browser/drive/fake_drive_service_unittest.cc', 'browser/extensions/active_script_controller_unittest.cc', 'browser/extensions/active_tab_unittest.cc', 'browser/extensions/activity_log/activity_database_unittest.cc', @@ -1995,17 +1995,12 @@ }], ['enable_extensions==1', { 'dependencies': [ + '../components/components.gyp:drive_test_support', '../components/components.gyp:storage_monitor_test_support', '../extensions/extensions.gyp:extensions_test_support', 'common/extensions/api/api.gyp:chrome_api', ], 'sources': [ - 'browser/drive/dummy_drive_service.cc', - 'browser/drive/dummy_drive_service.h', - 'browser/drive/fake_drive_service.cc', - 'browser/drive/fake_drive_service.h', - 'browser/drive/test_util.cc', - 'browser/drive/test_util.h', 'browser/extensions/api/messaging/native_messaging_test_util.cc', 'browser/extensions/api/messaging/native_messaging_test_util.h', 'browser/extensions/extension_action_test_util.cc', diff --git a/components/OWNERS b/components/OWNERS index 87bd75f..ff02618 100644 --- a/components/OWNERS +++ b/components/OWNERS @@ -82,6 +82,14 @@ per-file domain_reliability.gypi=mmenke@chromium.org per-file domain_reliability.gypi=szym@chromium.org per-file domain_reliability.gypi=ttuttle@chromium.org +per-file drive.gypi=fukino@chromium.org +per-file drive.gypi=hashimoto@chromium.org +per-file drive.gypi=hidehiko@chromium.org +per-file drive.gypi=hirono@chromium.org +per-file drive.gypi=kinaba@chromium.org +per-file drive.gypi=mtomasz@chromium.org +per-file drive.gypi=yoshiki@chromium.org + per-file enhanced_bookmarks*=kkimlabs@chromium.org per-file enhanced_bookmarks*=noyau@chromium.org per-file enhanced_bookmarks*=sky@chromium.org diff --git a/components/components.gyp b/components/components.gyp index 52bd3e1..43889d1 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -94,6 +94,7 @@ 'cdm.gypi', 'devtools_discovery.gypi', 'devtools_http_handler.gypi', + 'drive.gypi', 'message_port.gypi', 'navigation_interception.gypi', 'power.gypi', diff --git a/components/drive.gypi b/components/drive.gypi new file mode 100644 index 0000000..d01f420 --- /dev/null +++ b/components/drive.gypi @@ -0,0 +1,83 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'targets': [ + { + # GN version: //components/drive:drive + 'target_name': 'drive', + 'type': 'static_library', + 'include_dirs': [ + '..', + ], + 'dependencies': [ + '../base/base.gyp:base', + '../components/components.gyp:invalidation_public', + + # TODO(lukasza): Remove this dependency (see DEPS file for more info). + '../content/content.gyp:content_browser', + + '../google_apis/google_apis.gyp:google_apis', + '../net/net.gyp:net', + + # TODO(lukasza): Remove this dependency (see DEPS file for more info). + '../storage/storage_browser.gyp:storage', + + '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', + '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', + '../third_party/re2/re2.gyp:re2', + ], + 'sources': [ + 'drive/drive_api_util.cc', + 'drive/drive_api_util.h', + 'drive/drive_app_registry.cc', + 'drive/drive_app_registry.h', + 'drive/drive_app_registry_observer.h', + 'drive/drive_notification_manager.cc', + 'drive/drive_notification_manager.h', + 'drive/drive_notification_observer.h', + 'drive/drive_uploader.cc', + 'drive/drive_uploader.h', + 'drive/event_logger.cc', + 'drive/event_logger.h', + 'drive/service/drive_api_service.cc', + 'drive/service/drive_api_service.h', + 'drive/service/drive_service_interface.cc', + 'drive/service/drive_service_interface.h', + ], + }, + + { + # GN version: //components/drive:test_support + 'target_name': 'drive_test_support', + 'type': 'static_library', + 'include_dirs': [ + '..', + ], + 'dependencies': [ + 'drive', + '../base/base.gyp:base', + '../google_apis/google_apis.gyp:google_apis', + '../net/net.gyp:net', + ], + 'sources': [ + "drive/service/dummy_drive_service.cc", + "drive/service/dummy_drive_service.h", + "drive/service/fake_drive_service.cc", + "drive/service/fake_drive_service.h", + "drive/service/test_util.cc", + "drive/service/test_util.h", + ], + }, + + # TODO(lukasza): drive_unittests target. + # Currently tests are built as part of chrome/chrome_tests_unit.gypi. + # Drive files that probably should be moved out of chrome_tests_unit.gypi: + # components/drive/service/drive_api_util_unittest.cc + # components/drive/service/drive_app_registry_unittest.cc + # components/drive/service/drive_uploader_unittest.cc + # components/drive/service/event_logger_unittest.cc + # components/drive/service/fake_drive_service_unittest.cc + ], +} diff --git a/components/drive/BUILD.gn b/components/drive/BUILD.gn new file mode 100644 index 0000000..64f3141 --- /dev/null +++ b/components/drive/BUILD.gn @@ -0,0 +1,57 @@ +# Copyright (c) 2015 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("drive") { + sources = [ + "drive_api_util.cc", + "drive_api_util.h", + "drive_app_registry.cc", + "drive_app_registry.h", + "drive_app_registry_observer.h", + "drive_notification_manager.cc", + "drive_notification_manager.h", + "drive_notification_observer.h", + "drive_uploader.cc", + "drive_uploader.h", + "event_logger.cc", + "event_logger.h", + "service/drive_api_service.cc", + "service/drive_api_service.h", + "service/drive_service_interface.cc", + "service/drive_service_interface.h", + ] + deps = [ + "//base:base", + "//components/invalidation/public", + + # TODO(lukasza): Remove this dependency (see DEPS file for more info). + "//content/public/browser:browser", + + "//google_apis:google_apis", + "//net:net", + + # TODO(lukasza): Remove this dependency (see DEPS file for more info). + "//storage/browser:browser", + + "//third_party/re2:re2", + ] +} + +source_set("test_support") { + testonly = true + sources = [ + "service/dummy_drive_service.cc", + "service/dummy_drive_service.h", + "service/fake_drive_service.cc", + "service/fake_drive_service.h", + "service/test_util.cc", + "service/test_util.h", + ] + deps = [ + ":drive", + "//base:base", + "//google_apis:google_apis", + "//net:net", + ] +} diff --git a/components/drive/DEPS b/components/drive/DEPS new file mode 100644 index 0000000..818ed7c --- /dev/null +++ b/components/drive/DEPS @@ -0,0 +1,24 @@ +include_rules = [ + "+components/invalidation", + "+components/keyed_service", + "+google_apis", + "+google/cacheinvalidation/types.pb.h", + "+net", + "+third_party/re2", +] + +specific_include_rules = { + # The following dependency should be removed to fully make this + # directory chrome/ and content/ and storage/ independent. + # crbug.com/257943 + "drive_api_util\.cc": [ + "+storage/browser/fileapi/file_stream_reader.h" + ], + + # The following dependency should be removed to fully make this + # directory chrome/ and content/ and storage/ independent. + # crbug.com/257943 + "drive_uploader\.cc": [ + "+content/public/browser/power_save_blocker.h", + ], +} diff --git a/components/drive/OWNERS b/components/drive/OWNERS new file mode 100644 index 0000000..aec41e6 --- /dev/null +++ b/components/drive/OWNERS @@ -0,0 +1,7 @@ +fukino@chromium.org +hashimoto@chromium.org +hidehiko@chromium.org +hirono@chromium.org +kinaba@chromium.org +mtomasz@chromium.org +yoshiki@chromium.org diff --git a/components/drive/README b/components/drive/README new file mode 100644 index 0000000..beaedae --- /dev/null +++ b/components/drive/README @@ -0,0 +1,3 @@ +This directory contains utility code for accessing Google Drive, shared by +SyncFileSystem (chrome/browser/sync_file_system) and Google Drive integration +on Chrome OS (chrome/browser/chromeos/drive). diff --git a/chrome/browser/drive/drive_api_util.cc b/components/drive/drive_api_util.cc index bd9ba99..57c3919 100644 --- a/chrome/browser/drive/drive_api_util.cc +++ b/components/drive/drive_api_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/drive/drive_api_util.h" +#include "components/drive/drive_api_util.h" #include <string> diff --git a/chrome/browser/drive/drive_api_util.h b/components/drive/drive_api_util.h index 4c2e545..f34f21e 100644 --- a/chrome/browser/drive/drive_api_util.h +++ b/components/drive/drive_api_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_DRIVE_DRIVE_API_UTIL_H_ -#define CHROME_BROWSER_DRIVE_DRIVE_API_UTIL_H_ +#ifndef COMPONENTS_DRIVE_DRIVE_API_UTIL_H_ +#define COMPONENTS_DRIVE_DRIVE_API_UTIL_H_ #include <string> @@ -121,4 +121,4 @@ bool HasHostedDocumentExtension(const base::FilePath& path); } // namespace util } // namespace drive -#endif // CHROME_BROWSER_DRIVE_DRIVE_API_UTIL_H_ +#endif // COMPONENTS_DRIVE_DRIVE_API_UTIL_H_ diff --git a/chrome/browser/drive/drive_api_util_unittest.cc b/components/drive/drive_api_util_unittest.cc index 60730d4..20fe8a5 100644 --- a/chrome/browser/drive/drive_api_util_unittest.cc +++ b/components/drive/drive_api_util_unittest.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/drive/drive_api_util.h" +#include "components/drive/drive_api_util.h" #include "base/files/scoped_temp_dir.h" #include "base/md5.h" diff --git a/chrome/browser/drive/drive_app_registry.cc b/components/drive/drive_app_registry.cc index eb75c9b..90598e7 100644 --- a/chrome/browser/drive/drive_app_registry.cc +++ b/components/drive/drive_app_registry.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/drive/drive_app_registry.h" +#include "components/drive/drive_app_registry.h" #include <algorithm> #include <set> @@ -10,8 +10,8 @@ #include "base/callback.h" #include "base/files/file_path.h" -#include "chrome/browser/drive/drive_app_registry_observer.h" -#include "chrome/browser/drive/drive_service_interface.h" +#include "components/drive/drive_app_registry_observer.h" +#include "components/drive/service/drive_service_interface.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/google_api_keys.h" diff --git a/chrome/browser/drive/drive_app_registry.h b/components/drive/drive_app_registry.h index 1edad1f..817543f 100644 --- a/chrome/browser/drive/drive_app_registry.h +++ b/components/drive/drive_app_registry.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_DRIVE_DRIVE_APP_REGISTRY_H_ -#define CHROME_BROWSER_DRIVE_DRIVE_APP_REGISTRY_H_ +#ifndef COMPONENTS_DRIVE_DRIVE_APP_REGISTRY_H_ +#define COMPONENTS_DRIVE_DRIVE_APP_REGISTRY_H_ #include <map> #include <string> @@ -157,4 +157,4 @@ GURL FindPreferredIcon(const DriveAppInfo::IconList& icons, } // namespace drive -#endif // CHROME_BROWSER_DRIVE_DRIVE_APP_REGISTRY_H_ +#endif // COMPONENTS_DRIVE_DRIVE_APP_REGISTRY_H_ diff --git a/chrome/browser/drive/drive_app_registry_observer.h b/components/drive/drive_app_registry_observer.h index 15750e6..d22781f 100644 --- a/chrome/browser/drive/drive_app_registry_observer.h +++ b/components/drive/drive_app_registry_observer.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_DRIVE_DRIVE_APP_REGISTRY_OBSERVER_H_ -#define CHROME_BROWSER_DRIVE_DRIVE_APP_REGISTRY_OBSERVER_H_ +#ifndef COMPONENTS_DRIVE_DRIVE_APP_REGISTRY_OBSERVER_H_ +#define COMPONENTS_DRIVE_DRIVE_APP_REGISTRY_OBSERVER_H_ namespace drive { @@ -18,4 +18,4 @@ class DriveAppRegistryObserver { } // namespace drive -#endif // CHROME_BROWSER_DRIVE_DRIVE_APP_REGISTRY_OBSERVER_H_ +#endif // COMPONENTS_DRIVE_DRIVE_APP_REGISTRY_OBSERVER_H_ diff --git a/chrome/browser/drive/drive_app_registry_unittest.cc b/components/drive/drive_app_registry_unittest.cc index da23cb6..d5dfd6c 100644 --- a/chrome/browser/drive/drive_app_registry_unittest.cc +++ b/components/drive/drive_app_registry_unittest.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/drive/drive_app_registry.h" +#include "components/drive/drive_app_registry.h" #include "base/files/file_path.h" #include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/values.h" -#include "chrome/browser/drive/drive_app_registry_observer.h" -#include "chrome/browser/drive/fake_drive_service.h" +#include "components/drive/drive_app_registry_observer.h" +#include "components/drive/service/fake_drive_service.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/drive/drive_notification_manager.cc b/components/drive/drive_notification_manager.cc index fb1e3a6..14e0768 100644 --- a/chrome/browser/drive/drive_notification_manager.cc +++ b/components/drive/drive_notification_manager.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/drive/drive_notification_manager.h" +#include "components/drive/drive_notification_manager.h" #include "base/metrics/histogram.h" -#include "chrome/browser/drive/drive_notification_observer.h" +#include "components/drive/drive_notification_observer.h" #include "components/invalidation/public/invalidation_service.h" #include "components/invalidation/public/object_id_invalidation_map.h" #include "google/cacheinvalidation/types.pb.h" diff --git a/chrome/browser/drive/drive_notification_manager.h b/components/drive/drive_notification_manager.h index 18ae5d0..5cbb8a7 100644 --- a/chrome/browser/drive/drive_notification_manager.h +++ b/components/drive/drive_notification_manager.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_DRIVE_DRIVE_NOTIFICATION_MANAGER_H_ -#define CHROME_BROWSER_DRIVE_DRIVE_NOTIFICATION_MANAGER_H_ +#ifndef COMPONENTS_DRIVE_DRIVE_NOTIFICATION_MANAGER_H_ +#define COMPONENTS_DRIVE_DRIVE_NOTIFICATION_MANAGER_H_ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/timer/timer.h" -#include "chrome/browser/drive/drive_notification_observer.h" +#include "components/drive/drive_notification_observer.h" #include "components/invalidation/public/invalidation_handler.h" #include "components/keyed_service/core/keyed_service.h" @@ -95,4 +95,4 @@ class DriveNotificationManager : public KeyedService, } // namespace drive -#endif // CHROME_BROWSER_DRIVE_DRIVE_NOTIFICATION_MANAGER_H_ +#endif // COMPONENTS_DRIVE_DRIVE_NOTIFICATION_MANAGER_H_ diff --git a/chrome/browser/drive/drive_notification_observer.h b/components/drive/drive_notification_observer.h index 5f6738f..b04a06b 100644 --- a/chrome/browser/drive/drive_notification_observer.h +++ b/components/drive/drive_notification_observer.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_DRIVE_DRIVE_NOTIFICATION_OBSERVER_H_ -#define CHROME_BROWSER_DRIVE_DRIVE_NOTIFICATION_OBSERVER_H_ +#ifndef COMPONENTS_DRIVE_DRIVE_NOTIFICATION_OBSERVER_H_ +#define COMPONENTS_DRIVE_DRIVE_NOTIFICATION_OBSERVER_H_ namespace drive { @@ -23,4 +23,4 @@ class DriveNotificationObserver { } // namespace drive -#endif // CHROME_BROWSER_DRIVE_DRIVE_NOTIFICATION_OBSERVER_H_ +#endif // COMPONENTS_DRIVE_DRIVE_NOTIFICATION_OBSERVER_H_ diff --git a/chrome/browser/drive/drive_uploader.cc b/components/drive/drive_uploader.cc index e267d24..210d1b1 100644 --- a/chrome/browser/drive/drive_uploader.cc +++ b/components/drive/drive_uploader.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/drive/drive_uploader.h" +#include "components/drive/drive_uploader.h" #include <algorithm> @@ -12,7 +12,7 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" #include "base/task_runner_util.h" -#include "chrome/browser/drive/drive_service_interface.h" +#include "components/drive/service/drive_service_interface.h" #include "content/public/browser/power_save_blocker.h" #include "google_apis/drive/drive_api_parser.h" diff --git a/chrome/browser/drive/drive_uploader.h b/components/drive/drive_uploader.h index 6d511bf..e383614 100644 --- a/chrome/browser/drive/drive_uploader.h +++ b/components/drive/drive_uploader.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_DRIVE_DRIVE_UPLOADER_H_ -#define CHROME_BROWSER_DRIVE_DRIVE_UPLOADER_H_ +#ifndef COMPONENTS_DRIVE_DRIVE_UPLOADER_H_ +#define COMPONENTS_DRIVE_DRIVE_UPLOADER_H_ #include <string> @@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" -#include "chrome/browser/drive/drive_service_interface.h" +#include "components/drive/service/drive_service_interface.h" #include "google_apis/drive/drive_api_error_codes.h" class GURL; @@ -237,4 +237,4 @@ class DriveUploader : public DriveUploaderInterface { } // namespace drive -#endif // CHROME_BROWSER_DRIVE_DRIVE_UPLOADER_H_ +#endif // COMPONENTS_DRIVE_DRIVE_UPLOADER_H_ diff --git a/chrome/browser/drive/drive_uploader_unittest.cc b/components/drive/drive_uploader_unittest.cc index 41b73b2..29fbf26ac 100644 --- a/chrome/browser/drive/drive_uploader_unittest.cc +++ b/components/drive/drive_uploader_unittest.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/drive/drive_uploader.h" +#include "components/drive/drive_uploader.h" #include <algorithm> #include <string> @@ -15,7 +15,7 @@ #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" -#include "chrome/browser/drive/dummy_drive_service.h" +#include "components/drive/service/dummy_drive_service.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/drive/event_logger.cc b/components/drive/event_logger.cc index 69c8541..9815c11 100644 --- a/chrome/browser/drive/event_logger.cc +++ b/components/drive/event_logger.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/drive/event_logger.h" +#include "components/drive/event_logger.h" #include "base/logging.h" #include "base/strings/stringprintf.h" diff --git a/chrome/browser/drive/event_logger.h b/components/drive/event_logger.h index b8c356c..6b82a4c 100644 --- a/chrome/browser/drive/event_logger.h +++ b/components/drive/event_logger.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_DRIVE_EVENT_LOGGER_H_ -#define CHROME_BROWSER_DRIVE_EVENT_LOGGER_H_ +#ifndef COMPONENTS_DRIVE_EVENT_LOGGER_H_ +#define COMPONENTS_DRIVE_EVENT_LOGGER_H_ #include <deque> #include <string> @@ -66,4 +66,4 @@ class EventLogger { } // namespace drive -#endif // CHROME_BROWSER_DRIVE_EVENT_LOGGER_H_ +#endif // COMPONENTS_DRIVE_EVENT_LOGGER_H_ diff --git a/chrome/browser/drive/event_logger_unittest.cc b/components/drive/event_logger_unittest.cc index df8b5b7..9d3b1fd 100644 --- a/chrome/browser/drive/event_logger_unittest.cc +++ b/components/drive/event_logger_unittest.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/drive/event_logger.h" +#include "components/drive/event_logger.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/drive/drive_api_service.cc b/components/drive/service/drive_api_service.cc index 6a875ad..644079a 100644 --- a/chrome/browser/drive/drive_api_service.cc +++ b/components/drive/service/drive_api_service.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/drive/drive_api_service.h" +#include "components/drive/service/drive_api_service.h" #include <string> #include <vector> #include "base/bind.h" #include "base/strings/stringprintf.h" -#include "chrome/browser/drive/drive_api_util.h" +#include "components/drive/drive_api_util.h" #include "google_apis/drive/auth_service.h" #include "google_apis/drive/base_requests.h" #include "google_apis/drive/drive_api_parser.h" diff --git a/chrome/browser/drive/drive_api_service.h b/components/drive/service/drive_api_service.h index afe98a0..22bb7d4 100644 --- a/chrome/browser/drive/drive_api_service.h +++ b/components/drive/service/drive_api_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_DRIVE_DRIVE_API_SERVICE_H_ -#define CHROME_BROWSER_DRIVE_DRIVE_API_SERVICE_H_ +#ifndef COMPONENTS_DRIVE_SERVICE_DRIVE_API_SERVICE_H_ +#define COMPONENTS_DRIVE_SERVICE_DRIVE_API_SERVICE_H_ #include <string> @@ -12,7 +12,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/threading/thread_checker.h" -#include "chrome/browser/drive/drive_service_interface.h" +#include "components/drive/service/drive_service_interface.h" #include "google_apis/drive/auth_service_interface.h" #include "google_apis/drive/auth_service_observer.h" #include "google_apis/drive/drive_api_url_generator.h" @@ -266,4 +266,4 @@ class DriveAPIService : public DriveServiceInterface, } // namespace drive -#endif // CHROME_BROWSER_DRIVE_DRIVE_API_SERVICE_H_ +#endif // COMPONENTS_DRIVE_SERVICE_DRIVE_API_SERVICE_H_ diff --git a/chrome/browser/drive/drive_api_service_unittest.cc b/components/drive/service/drive_api_service_unittest.cc index 44f17ca..6655e68 100644 --- a/chrome/browser/drive/drive_api_service_unittest.cc +++ b/components/drive/service/drive_api_service_unittest.cc @@ -4,7 +4,7 @@ #include "base/message_loop/message_loop.h" #include "base/test/test_simple_task_runner.h" -#include "chrome/browser/drive/drive_api_service.h" +#include "components/drive/service/drive_api_service.h" #include "google_apis/drive/dummy_auth_service.h" #include "google_apis/drive/request_sender.h" #include "google_apis/drive/test_util.h" diff --git a/chrome/browser/drive/drive_service_interface.cc b/components/drive/service/drive_service_interface.cc index 1c9f65d..76c1f20 100644 --- a/chrome/browser/drive/drive_service_interface.cc +++ b/components/drive/service/drive_service_interface.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/drive/drive_service_interface.h" +#include "components/drive/service/drive_service_interface.h" namespace drive { diff --git a/chrome/browser/drive/drive_service_interface.h b/components/drive/service/drive_service_interface.h index 9fa2383..1c0dadd 100644 --- a/chrome/browser/drive/drive_service_interface.h +++ b/components/drive/service/drive_service_interface.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_DRIVE_DRIVE_SERVICE_INTERFACE_H_ -#define CHROME_BROWSER_DRIVE_DRIVE_SERVICE_INTERFACE_H_ +#ifndef COMPONENTS_DRIVE_SERVICE_DRIVE_SERVICE_INTERFACE_H_ +#define COMPONENTS_DRIVE_SERVICE_DRIVE_SERVICE_INTERFACE_H_ #include <string> @@ -464,4 +464,4 @@ class DriveServiceInterface : public DriveServiceBatchOperationsInterface { } // namespace drive -#endif // CHROME_BROWSER_DRIVE_DRIVE_SERVICE_INTERFACE_H_ +#endif // COMPONENTS_DRIVE_SERVICE_DRIVE_SERVICE_INTERFACE_H_ diff --git a/chrome/browser/drive/dummy_drive_service.cc b/components/drive/service/dummy_drive_service.cc index 053cb17..8700fce 100644 --- a/chrome/browser/drive/dummy_drive_service.cc +++ b/components/drive/service/dummy_drive_service.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/drive/dummy_drive_service.h" +#include "components/drive/service/dummy_drive_service.h" #include "base/bind.h" diff --git a/chrome/browser/drive/dummy_drive_service.h b/components/drive/service/dummy_drive_service.h index 338e44c..3317c45 100644 --- a/chrome/browser/drive/dummy_drive_service.h +++ b/components/drive/service/dummy_drive_service.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_DRIVE_DUMMY_DRIVE_SERVICE_H_ -#define CHROME_BROWSER_DRIVE_DUMMY_DRIVE_SERVICE_H_ +#ifndef COMPONENTS_DRIVE_SERVICE_DUMMY_DRIVE_SERVICE_H_ +#define COMPONENTS_DRIVE_SERVICE_DUMMY_DRIVE_SERVICE_H_ #include <string> -#include "chrome/browser/drive/drive_service_interface.h" +#include "components/drive/service/drive_service_interface.h" #include "google_apis/drive/auth_service_interface.h" namespace drive { @@ -163,4 +163,4 @@ class DummyDriveService : public DriveServiceInterface { } // namespace drive -#endif // CHROME_BROWSER_DRIVE_DUMMY_DRIVE_SERVICE_H_ +#endif // COMPONENTS_DRIVE_SERVICE_DUMMY_DRIVE_SERVICE_H_ diff --git a/chrome/browser/drive/fake_drive_service.cc b/components/drive/service/fake_drive_service.cc index 9c63c9b..81b55d1 100644 --- a/chrome/browser/drive/fake_drive_service.cc +++ b/components/drive/service/fake_drive_service.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/drive/fake_drive_service.h" +#include "components/drive/service/fake_drive_service.h" #include <string> @@ -18,7 +18,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" -#include "chrome/browser/drive/drive_api_util.h" +#include "components/drive/drive_api_util.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" #include "net/base/escape.h" diff --git a/chrome/browser/drive/fake_drive_service.h b/components/drive/service/fake_drive_service.h index 78cfdeb..09ae14a 100644 --- a/chrome/browser/drive/fake_drive_service.h +++ b/components/drive/service/fake_drive_service.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_DRIVE_FAKE_DRIVE_SERVICE_H_ -#define CHROME_BROWSER_DRIVE_FAKE_DRIVE_SERVICE_H_ +#ifndef COMPONENTS_DRIVE_SERVICE_FAKE_DRIVE_SERVICE_H_ +#define COMPONENTS_DRIVE_SERVICE_FAKE_DRIVE_SERVICE_H_ #include <string> #include "base/files/file_path.h" #include "base/threading/thread_checker.h" -#include "chrome/browser/drive/drive_service_interface.h" +#include "components/drive/service/drive_service_interface.h" namespace base { class DictionaryValue; @@ -403,4 +403,4 @@ class FakeDriveService : public DriveServiceInterface { } // namespace drive -#endif // CHROME_BROWSER_DRIVE_FAKE_DRIVE_SERVICE_H_ +#endif // COMPONENTS_DRIVE_SERVICE_FAKE_DRIVE_SERVICE_H_ diff --git a/chrome/browser/drive/fake_drive_service_unittest.cc b/components/drive/service/fake_drive_service_unittest.cc index 6df9a03..009f8ca 100644 --- a/chrome/browser/drive/fake_drive_service_unittest.cc +++ b/components/drive/service/fake_drive_service_unittest.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/drive/fake_drive_service.h" +#include "components/drive/service/fake_drive_service.h" #include <string> #include <vector> @@ -15,7 +15,7 @@ #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/drive/test_util.h" +#include "components/drive/service/test_util.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/drive/test_util.cc b/components/drive/service/test_util.cc index 575cfe6..42c54f1 100644 --- a/chrome/browser/drive/test_util.cc +++ b/components/drive/service/test_util.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/drive/test_util.h" +#include "components/drive/service/test_util.h" #include "base/run_loop.h" -#include "chrome/browser/drive/drive_api_util.h" -#include "chrome/browser/drive/fake_drive_service.h" +#include "components/drive/drive_api_util.h" +#include "components/drive/service/fake_drive_service.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" diff --git a/chrome/browser/drive/test_util.h b/components/drive/service/test_util.h index 32a71a1..9cd25ae 100644 --- a/chrome/browser/drive/test_util.h +++ b/components/drive/service/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_DRIVE_TEST_UTIL_H_ -#define CHROME_BROWSER_DRIVE_TEST_UTIL_H_ +#ifndef COMPONENTS_DRIVE_SERVICE_TEST_UTIL_H_ +#define COMPONENTS_DRIVE_SERVICE_TEST_UTIL_H_ namespace drive { @@ -16,4 +16,4 @@ bool SetUpTestEntries(FakeDriveService* drive_service); } // namespace test_util } // namespace drive -#endif // CHROME_BROWSER_DRIVE_TEST_UTIL_H_ +#endif // COMPONENTS_DRIVE_SERVICE_TEST_UTIL_H_ |