From 8acc4eb18b6919f36413a10718a607f2a34fb8f6 Mon Sep 17 00:00:00 2001 From: lukasza Date: Mon, 20 Jul 2015 13:57:20 -0700 Subject: Move (most of) chrome/browser/drive into components/drive. Note that drive_notification_manager_factory is left behind in chrome/browser/drive. This is because it needs to stay dependent on the browser. This is okay, because drive_notification_manager_factory is not needed by drive::FileSystem and other parts of drive libraries that we want to componentize. Also note that some things moved to components/drive continue to have slightly undesirable dependencies: - Tests are still built and executed as part of the browser test suites. - drive_uploader.cc depends on content/public/browser/power_save_blocker.h This means that to use components/drive outside of the browser, users of components/drive have to provide a no-op implementation of power_save_blocker.h The most desirable approach in the long-term would be to componentize power_save_blocker.h. An alternative would be to continue with the state introduced by the current changelist (or to introduce drive-specific abstraction similar to power_save_blocker.h, but outside of the browser). - drive_api_util.cc depends on storage/browser/fileapi/file_stream_reader.h To get rid of this dependency, it is probably best to move FileStreamMd5Digester class closer to the only point of usage (c/b/chromeos/extensions/file_manager/private_api_file_system.cc). Landing via CQ with NOPRESUBMIT=true, because "git cl presubmit" incorrectly identifies target directory of a dependency (we are depending on third_party/cacheinvalidation/src/google/cacheinvalidation/types.proto and including the generated header via google/cacheinvalidation/types.pb.h). I believe this is a case of crbug.com/448570. All other presubmit checks are passing AFAIK: $ git cl presubmit Running presubmit commit checks ... ** Presubmit ERRORS ** Missing LGTM from OWNERS of dependencies added to DEPS: '+google/cacheinvalidation/types.pb.h', Presubmit checks took 2.9s to calculate. Test steps: 1. Verify that things still build via GYP (and unit tests pass). $ GYP_DEFINES="use_goma=1 gomadir=... chromeos=1" gclient sync $ ninja -C out/Debug -j 150 chrome unit_tests \ interactive_ui_tests browser_tests drive $ out/Debug/unit_tests 2. Verify that things still builds via GN. $ gn gen out/Default --args='target_os="chromeos" use_goma=true' $ ninja -C out/Default -j 150 chrome unit_tests \ interactive_ui_tests browser_tests components/drive TEST=Please see "Test steps" above. BUG=257943, 498951 NOPRESUBMIT=true Review URL: https://codereview.chromium.org/1190203002 Cr-Commit-Position: refs/heads/master@{#339512} --- chrome/browser/apps/drive/DEPS | 3 +++ chrome/browser/apps/drive/drive_app_converter.h | 2 +- chrome/browser/apps/drive/drive_app_provider.cc | 2 +- chrome/browser/apps/drive/drive_app_provider.h | 2 +- chrome/browser/apps/drive/drive_app_provider_browsertest.cc | 4 ++-- chrome/browser/apps/drive/drive_service_bridge.cc | 8 ++++---- 6 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 chrome/browser/apps/drive/DEPS (limited to 'chrome/browser/apps') 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 #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" -- cgit v1.1