Move chrome/browser/chromeos/drive/file_system (+deps) into components/drive.

Files moved from chrome/browser/chromeos/drive into components/drive:
- all the files under drive/file_system/...
- file_system_interface*
- file_system_metadata*
- file_write_watcher*
- resource_metadata*
- resource_metadata_storage*

Other changes:
- Refactoring to limit usage of cryptohome::kMinFreeSpaceInBytes to only
  drive/file_cache.h

Test steps:
1. Verify that things still build via GYP.
   $ GYP_DEFINES="use_goma=1 chromeos=1 component=shared_library" gclient sync
   $ ninja -C out/Debug -j 150 chrome unit_tests \
         interactive_ui_tests browser_tests drive

2. Verify that things still build via GN.
    $ gn gen out/Default --args='target_os="chromeos" use_goma=true is_component_build=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
TBR=stevejb@chromium.org and kinuko@chromium.org

Review URL: https://codereview.chromium.org/1318543003

Cr-Commit-Position: refs/heads/master@{#345984}

90 files changed, 295 insertions, 247 deletions

diff --git a/chrome/browser/chromeos/drive/debug_info_collector.h b/chrome/browser/chromeos/drive/debug_info_collector.h
index 213caea..cc5aa84 100644
--- a/chrome/browser/chromeos/drive/debug_info_collector.h
+++ b/chrome/browser/chromeos/drive/debug_info_collector.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
+#include "components/drive/file_system_interface.h"
 
 namespace drive {
 
diff --git a/chrome/browser/chromeos/drive/directory_loader.h b/chrome/browser/chromeos/drive/directory_loader.h
index a009ffe..4ba8f1a 100644
--- a/chrome/browser/chromeos/drive/directory_loader.h
+++ b/chrome/browser/chromeos/drive/directory_loader.h
@@ -15,8 +15,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system_interface.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 #include "google_apis/drive/drive_common_callbacks.h"
 
diff --git a/chrome/browser/chromeos/drive/download_handler.cc b/chrome/browser/chromeos/drive/download_handler.cc
index 66e5ad1..e42ce1b 100644
--- a/chrome/browser/chromeos/drive/download_handler.cc
+++ b/chrome/browser/chromeos/drive/download_handler.cc
@@ -9,13 +9,13 @@
 #include "base/supports_user_data.h"
 #include "base/threading/sequenced_worker_pool.h"
 #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/chromeos/drive/write_on_cache_file.h"
 #include "chrome/browser/download/download_history.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_system_interface.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc
index 71e30fc..1437236 100644
--- a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc
+++ b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc
@@ -10,8 +10,8 @@
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/sequenced_task_runner.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_system_interface.h"
 #include "components/drive/local_file_reader.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/drive/task_util.h"
diff --git a/chrome/browser/chromeos/drive/dummy_file_system.h b/chrome/browser/chromeos/drive/dummy_file_system.h
index 04e68dc..28003df 100644
--- a/chrome/browser/chromeos/drive/dummy_file_system.h
+++ b/chrome/browser/chromeos/drive/dummy_file_system.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DUMMY_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_DUMMY_FILE_SYSTEM_H_
 
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
+#include "components/drive/file_system_interface.h"
 
 namespace drive {
 
diff --git a/chrome/browser/chromeos/drive/fake_file_system.h b/chrome/browser/chromeos/drive/fake_file_system.h
index 83facbc..13757d7 100644
--- a/chrome/browser/chromeos/drive/fake_file_system.h
+++ b/chrome/browser/chromeos/drive/fake_file_system.h
@@ -11,8 +11,8 @@
 #include "base/callback_forward.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system_interface.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 namespace google_apis {
diff --git a/chrome/browser/chromeos/drive/file_system.cc b/chrome/browser/chromeos/drive/file_system.cc
index 9cad97e..faf230d 100644
--- a/chrome/browser/chromeos/drive/file_system.cc
+++ b/chrome/browser/chromeos/drive/file_system.cc
@@ -8,18 +8,6 @@
 #include "base/files/file_util.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/drive/directory_loader.h"
-#include "chrome/browser/chromeos/drive/file_system/copy_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/create_directory_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/create_file_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/download_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/move_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/open_file_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/search_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/set_property_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/touch_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/truncate_operation.h"
 #include "chrome/browser/chromeos/drive/file_system_observer.h"
 #include "chrome/browser/chromeos/drive/remove_stale_cache_files.h"
 #include "chrome/browser/chromeos/drive/search_metadata.h"
@@ -29,6 +17,18 @@
 #include "components/drive/drive_pref_names.h"
 #include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system/copy_operation.h"
+#include "components/drive/file_system/create_directory_operation.h"
+#include "components/drive/file_system/create_file_operation.h"
+#include "components/drive/file_system/download_operation.h"
+#include "components/drive/file_system/get_file_for_saving_operation.h"
+#include "components/drive/file_system/move_operation.h"
+#include "components/drive/file_system/open_file_operation.h"
+#include "components/drive/file_system/remove_operation.h"
+#include "components/drive/file_system/search_operation.h"
+#include "components/drive/file_system/set_property_operation.h"
+#include "components/drive/file_system/touch_operation.h"
+#include "components/drive/file_system/truncate_operation.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_entry_conversion.h"
diff --git a/chrome/browser/chromeos/drive/file_system.h b/chrome/browser/chromeos/drive/file_system.h
index e540019..b6c91a8 100644
--- a/chrome/browser/chromeos/drive/file_system.h
+++ b/chrome/browser/chromeos/drive/file_system.h
@@ -12,9 +12,9 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "components/drive/change_list_loader_observer.h"
+#include "components/drive/file_system/operation_delegate.h"
+#include "components/drive/file_system_interface.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 class PrefService;
diff --git a/chrome/browser/chromeos/drive/file_system_observer.h b/chrome/browser/chromeos/drive/file_system_observer.h
index a4a0891..cca6684 100644
--- a/chrome/browser/chromeos/drive/file_system_observer.h
+++ b/chrome/browser/chromeos/drive/file_system_observer.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OBSERVER_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OBSERVER_H_
 
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system/operation_delegate.h"
 
 namespace base {
 class FilePath;
diff --git a/chrome/browser/chromeos/drive/file_system_util.cc b/chrome/browser/chromeos/drive/file_system_util.cc
index cbb697a..1e661d2 100644
--- a/chrome/browser/chromeos/drive/file_system_util.cc
+++ b/chrome/browser/chromeos/drive/file_system_util.cc
@@ -24,7 +24,6 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/write_on_cache_file.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/profiles/profile_util.h"
@@ -36,6 +35,7 @@
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_pref_names.h"
 #include "components/drive/file_system_core_util.h"
+#include "components/drive/file_system_interface.h"
 #include "components/drive/job_list.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/chromeos/drive/file_task_executor.cc b/chrome/browser/chromeos/drive/file_task_executor.cc
index ae60295..6976ebe 100644
--- a/chrome/browser/chromeos/drive/file_task_executor.cc
+++ b/chrome/browser/chromeos/drive/file_task_executor.cc
@@ -8,7 +8,6 @@
 #include <vector>
 
 #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/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
@@ -18,6 +17,7 @@
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/common/extensions/api/file_manager_private.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_system_interface.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/fileapi/file_system_backend_delegate.cc b/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc
index 6e9bcc1..a231ab0 100644
--- a/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc
+++ b/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc
@@ -7,13 +7,13 @@
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/fileapi/async_file_util.h"
 #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 "components/drive/drive_api_util.h"
+#include "components/drive/file_system_interface.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/fileapi_worker.cc b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc
index 0d8b232..128b42c 100644
--- a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc
+++ b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc
@@ -9,10 +9,10 @@
 #include "base/task_runner_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system_interface.h"
 #include "components/drive/resource_entry_conversion.h"
 #include "content/public/browser/browser_thread.h"
 #include "storage/browser/fileapi/file_system_url.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 333b909..59f2320 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
@@ -13,9 +13,9 @@
 #include "base/threading/thread.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/drive/fake_file_system.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "components/drive/drive_test_util.h"
 #include "components/drive/file_system_core_util.h"
+#include "components/drive/file_system_interface.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"
diff --git a/chrome/browser/chromeos/drive/search_metadata.h b/chrome/browser/chromeos/drive/search_metadata.h
index 2acb281..aa20ed9 100644
--- a/chrome/browser/chromeos/drive/search_metadata.h
+++ b/chrome/browser/chromeos/drive/search_metadata.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
+#include "components/drive/file_system_interface.h"
 
 namespace base {
 namespace i18n {
diff --git a/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc b/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc
index 18a3bbe..fb6f574 100644
--- a/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc
+++ b/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/browser/chromeos/drive/sync/entry_revert_performer.h"
 
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "components/drive/change_list_processor.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_api_util.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_entry_conversion.h"
 #include "components/drive/resource_metadata.h"
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 2ebd2f7..0198f1f 100644
--- a/chrome/browser/chromeos/drive/sync/entry_revert_performer_unittest.cc
+++ b/chrome/browser/chromeos/drive/sync/entry_revert_performer_unittest.cc
@@ -5,8 +5,8 @@
 #include "chrome/browser/chromeos/drive/sync/entry_revert_performer.h"
 
 #include "base/task_runner_util.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system/operation_test_base.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_metadata.h"
diff --git a/chrome/browser/chromeos/drive/sync/entry_update_performer.cc b/chrome/browser/chromeos/drive/sync/entry_update_performer.cc
index 166a829..f3b24a9 100644
--- a/chrome/browser/chromeos/drive/sync/entry_update_performer.cc
+++ b/chrome/browser/chromeos/drive/sync/entry_update_performer.cc
@@ -8,13 +8,13 @@
 
 #include "base/callback_helpers.h"
 #include "base/files/file_util.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "chrome/browser/chromeos/drive/sync/entry_revert_performer.h"
 #include "chrome/browser/chromeos/drive/sync/remove_performer.h"
 #include "components/drive/change_list_loader.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_metadata.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 d174e56..c349404 100644
--- a/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc
+++ b/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc
@@ -8,10 +8,10 @@
 #include "base/files/file_util.h"
 #include "base/md5.h"
 #include "base/task_runner_util.h"
-#include "chrome/browser/chromeos/drive/file_system/download_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "components/drive/drive_api_util.h"
 #include "components/drive/file_cache.h"
+#include "components/drive/file_system/download_operation.h"
+#include "components/drive/file_system/operation_test_base.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_metadata.h"
 #include "components/drive/service/fake_drive_service.h"
diff --git a/chrome/browser/chromeos/drive/sync/remove_performer.cc b/chrome/browser/chromeos/drive/sync/remove_performer.cc
index 63245cd..3e24ce04 100644
--- a/chrome/browser/chromeos/drive/sync/remove_performer.cc
+++ b/chrome/browser/chromeos/drive/sync/remove_performer.cc
@@ -5,10 +5,10 @@
 #include "chrome/browser/chromeos/drive/sync/remove_performer.h"
 
 #include "base/sequenced_task_runner.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "chrome/browser/chromeos/drive/sync/entry_revert_performer.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_api_util.h"
+#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_entry_conversion.h"
diff --git a/chrome/browser/chromeos/drive/sync/remove_performer_unittest.cc b/chrome/browser/chromeos/drive/sync/remove_performer_unittest.cc
index b6f3a81..a9afd66 100644
--- a/chrome/browser/chromeos/drive/sync/remove_performer_unittest.cc
+++ b/chrome/browser/chromeos/drive/sync/remove_performer_unittest.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/chromeos/drive/sync/remove_performer.h"
 
 #include "base/task_runner_util.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
+#include "components/drive/file_system/operation_test_base.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_metadata.h"
diff --git a/chrome/browser/chromeos/drive/sync_client.cc b/chrome/browser/chromeos/drive/sync_client.cc
index 0807fe5..e5ca372 100644
--- a/chrome/browser/chromeos/drive/sync_client.cc
+++ b/chrome/browser/chromeos/drive/sync_client.cc
@@ -8,11 +8,11 @@
 
 #include "base/bind.h"
 #include "base/thread_task_runner_handle.h"
-#include "chrome/browser/chromeos/drive/file_system/download_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "chrome/browser/chromeos/drive/sync/entry_update_performer.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_cache.h"
+#include "components/drive/file_system/download_operation.h"
+#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "google_apis/drive/task_util.h"
diff --git a/chrome/browser/chromeos/drive/sync_client_unittest.cc b/chrome/browser/chromeos/drive/sync_client_unittest.cc
index 5285cdb..82ec22e 100644
--- a/chrome/browser/chromeos/drive/sync_client_unittest.cc
+++ b/chrome/browser/chromeos/drive/sync_client_unittest.cc
@@ -13,9 +13,6 @@
 #include "base/single_thread_task_runner.h"
 #include "base/test/test_timeouts.h"
 #include "base/thread_task_runner_handle.h"
-#include "chrome/browser/chromeos/drive/file_system/move_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
-#include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
 #include "components/drive/change_list_loader.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_test_util.h"
@@ -23,6 +20,9 @@
 #include "components/drive/fake_free_disk_space_getter.h"
 #include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system/move_operation.h"
+#include "components/drive/file_system/operation_delegate.h"
+#include "components/drive/file_system/remove_operation.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_entry_conversion.h"
diff --git a/chrome/browser/chromeos/drive/write_on_cache_file.cc b/chrome/browser/chromeos/drive/write_on_cache_file.cc
index bcfb30a..9b4b3b1 100644
--- a/chrome/browser/chromeos/drive/write_on_cache_file.cc
+++ b/chrome/browser/chromeos/drive/write_on_cache_file.cc
@@ -7,8 +7,8 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "components/drive/file_system_core_util.h"
+#include "components/drive/file_system_interface.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.cc b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
index 9d8bb48..3275ae3 100644
--- a/chrome/browser/chromeos/extensions/file_manager/event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
@@ -15,7 +15,6 @@
 #include "base/values.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #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/chromeos/extensions/file_manager/private_api_util.h"
 #include "chrome/browser/chromeos/file_manager/app_id.h"
@@ -37,6 +36,7 @@
 #include "chromeos/network/network_state_handler.h"
 #include "components/drive/drive_pref_names.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system_interface.h"
 #include "components/drive/service/drive_service_interface.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h
index 754694c..143f45b 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h
@@ -12,10 +12,10 @@
 
 #include "base/files/file.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_base.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system_interface.h"
 
 namespace drive {
 class FileCacheEntry;
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 805d6c5..4ee821c 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
@@ -16,7 +16,6 @@
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/extensions/file_manager/event_router.h"
 #include "chrome/browser/chromeos/extensions/file_manager/event_router_factory.h"
@@ -35,6 +34,7 @@
 #include "chromeos/disks/disk_mount_manager.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/event_logger.h"
+#include "components/drive/file_system_interface.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_mount.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc
index 44c00aa..201918b 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc
@@ -9,7 +9,6 @@
 #include "base/files/file_util.h"
 #include "base/format_macros.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
@@ -18,6 +17,7 @@
 #include "chrome/common/extensions/api/file_manager_private.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "components/drive/event_logger.h"
+#include "components/drive/file_system_interface.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/extensions/file_manager/private_api_util.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc
index 9ec2bba..1927b18 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc
@@ -9,7 +9,6 @@
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #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/chromeos/file_manager/app_id.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
@@ -22,6 +21,7 @@
 #include "chrome/common/extensions/api/file_manager_private.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system_interface.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #include "storage/browser/fileapi/file_system_url.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 b45489b..89b6259 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
@@ -13,7 +13,6 @@
 #include "base/strings/string_piece.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/file_manager/mount_test_util.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
@@ -23,6 +22,7 @@
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/chromeos_switches.h"
+#include "components/drive/file_system_interface.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
diff --git a/chrome/browser/chromeos/file_manager/filesystem_api_util.cc b/chrome/browser/chromeos/file_manager/filesystem_api_util.cc
index 35382c0..b97071f 100644
--- a/chrome/browser/chromeos/file_manager/filesystem_api_util.cc
+++ b/chrome/browser/chromeos/file_manager/filesystem_api_util.cc
@@ -8,7 +8,6 @@
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/file_manager/app_id.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
@@ -18,6 +17,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "components/drive/file_errors.h"
 #include "components/drive/file_system_core_util.h"
+#include "components/drive/file_system_interface.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "google_apis/drive/task_util.h"
diff --git a/chrome/browser/chromeos/file_manager/volume_manager.cc b/chrome/browser/chromeos/file_manager/volume_manager.cc
index 3a2cd56..0d3f439 100644
--- a/chrome/browser/chromeos/file_manager/volume_manager.cc
+++ b/chrome/browser/chromeos/file_manager/volume_manager.cc
@@ -16,7 +16,6 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #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/chromeos/file_manager/path_util.h"
 #include "chrome/browser/chromeos/file_manager/snapshot_manager.h"
@@ -30,6 +29,7 @@
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "components/drive/file_system_core_util.h"
+#include "components/drive/file_system_interface.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
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 a213397..ca86c43 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
@@ -12,7 +12,6 @@
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #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/chromeos/file_manager/volume_manager.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
@@ -21,6 +20,7 @@
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/file_system.h"
+#include "components/drive/file_system_interface.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/event_router.h"
diff --git a/chrome/browser/ui/ash/DEPS b/chrome/browser/ui/ash/DEPS
index ae41934..93d5ed2 100644
--- a/chrome/browser/ui/ash/DEPS
+++ b/chrome/browser/ui/ash/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+components/drive",
   "+components/user_manager",
   "+media",
 ]
diff --git a/chrome/browser/ui/ash/chrome_screenshot_grabber.cc b/chrome/browser/ui/ash/chrome_screenshot_grabber.cc
index 9642fc5..8e308b1 100644
--- a/chrome/browser/ui/ash/chrome_screenshot_grabber.cc
+++ b/chrome/browser/ui/ash/chrome_screenshot_grabber.cc
@@ -32,12 +32,12 @@
 #include "ui/strings/grit/ui_strings.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/file_manager/open_util.h"
 #include "chrome/browser/notifications/notifier_state_tracker.h"
 #include "chrome/browser/notifications/notifier_state_tracker_factory.h"
 #include "chromeos/login/login_state.h"
+#include "components/drive/file_system_interface.h"
 #endif
 
 namespace {
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 6ac52f0..7fc5559 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -107,43 +107,11 @@
         'browser/chromeos/drive/drive_integration_service.h',
         'browser/chromeos/drive/file_system.cc',
         'browser/chromeos/drive/file_system.h',
-        'browser/chromeos/drive/file_system/copy_operation.cc',
-        'browser/chromeos/drive/file_system/copy_operation.h',
-        'browser/chromeos/drive/file_system/create_directory_operation.cc',
-        'browser/chromeos/drive/file_system/create_directory_operation.h',
-        'browser/chromeos/drive/file_system/create_file_operation.cc',
-        'browser/chromeos/drive/file_system/create_file_operation.h',
-        'browser/chromeos/drive/file_system/download_operation.cc',
-        'browser/chromeos/drive/file_system/download_operation.h',
-        'browser/chromeos/drive/file_system/get_file_for_saving_operation.cc',
-        'browser/chromeos/drive/file_system/get_file_for_saving_operation.h',
-        'browser/chromeos/drive/file_system/move_operation.cc',
-        'browser/chromeos/drive/file_system/move_operation.h',
-        'browser/chromeos/drive/file_system/open_file_operation.cc',
-        'browser/chromeos/drive/file_system/open_file_operation.h',
-        'browser/chromeos/drive/file_system/operation_delegate.cc',
-        'browser/chromeos/drive/file_system/operation_delegate.h',
-        'browser/chromeos/drive/file_system/remove_operation.cc',
-        'browser/chromeos/drive/file_system/remove_operation.h',
-        'browser/chromeos/drive/file_system/search_operation.cc',
-        'browser/chromeos/drive/file_system/search_operation.h',
-        'browser/chromeos/drive/file_system/set_property_operation.cc',
-        'browser/chromeos/drive/file_system/set_property_operation.h',
-        'browser/chromeos/drive/file_system/touch_operation.cc',
-        'browser/chromeos/drive/file_system/touch_operation.h',
-        'browser/chromeos/drive/file_system/truncate_operation.cc',
-        'browser/chromeos/drive/file_system/truncate_operation.h',
-        'browser/chromeos/drive/file_system_interface.cc',
-        'browser/chromeos/drive/file_system_interface.h',
-        'browser/chromeos/drive/file_system_metadata.cc',
-        'browser/chromeos/drive/file_system_metadata.h',
         'browser/chromeos/drive/file_system_observer.h',
         'browser/chromeos/drive/file_system_util.cc',
         'browser/chromeos/drive/file_system_util.h',
         'browser/chromeos/drive/file_task_executor.cc',
         'browser/chromeos/drive/file_task_executor.h',
-        'browser/chromeos/drive/file_write_watcher.cc',
-        'browser/chromeos/drive/file_write_watcher.h',
         'browser/chromeos/drive/fileapi/async_file_util.cc',
         'browser/chromeos/drive/fileapi/async_file_util.h',
         'browser/chromeos/drive/fileapi/file_system_backend_delegate.cc',
@@ -697,10 +665,10 @@
         'browser/chromeos/mobile_config.h',
         'browser/chromeos/net/cert_verify_proc_chromeos.cc',
         'browser/chromeos/net/cert_verify_proc_chromeos.h',
-        "browser/chromeos/net/client_cert_store_chromeos.cc",
-        "browser/chromeos/net/client_cert_store_chromeos.h",
         'browser/chromeos/net/client_cert_filter_chromeos.cc',
         'browser/chromeos/net/client_cert_filter_chromeos.h',
+        'browser/chromeos/net/client_cert_store_chromeos.cc',
+        'browser/chromeos/net/client_cert_store_chromeos.h',
         'browser/chromeos/net/delay_network_call.cc',
         'browser/chromeos/net/delay_network_call.h',
         'browser/chromeos/net/network_portal_detector_impl.cc',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 874eb25..629f660 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1117,7 +1117,22 @@
       '../components/drive/change_list_processor_unittest.cc',
       '../components/drive/file_cache_unittest.cc',
       '../components/drive/file_change_unittest.cc',
+      '../components/drive/file_system/copy_operation_unittest.cc',
+      '../components/drive/file_system/create_directory_operation_unittest.cc',
+      '../components/drive/file_system/create_file_operation_unittest.cc',
+      '../components/drive/file_system/download_operation_unittest.cc',
+      '../components/drive/file_system/get_file_for_saving_operation_unittest.cc',
+      '../components/drive/file_system/move_operation_unittest.cc',
+      '../components/drive/file_system/open_file_operation_unittest.cc',
+      '../components/drive/file_system/operation_test_base.cc',
+      '../components/drive/file_system/operation_test_base.h',
+      '../components/drive/file_system/remove_operation_unittest.cc',
+      '../components/drive/file_system/search_operation_unittest.cc',
+      '../components/drive/file_system/set_property_operation_unittest.cc',
+      '../components/drive/file_system/touch_operation_unittest.cc',
+      '../components/drive/file_system/truncate_operation_unittest.cc',
       '../components/drive/file_system_core_util_unittest.cc',
+      '../components/drive/file_write_watcher_unittest.cc',
       '../components/drive/job_queue_unittest.cc',
       '../components/drive/job_scheduler_unittest.cc',
       '../components/drive/local_file_reader_unittest.cc',
@@ -1142,24 +1157,9 @@
       'browser/chromeos/drive/fake_file_system.cc',
       'browser/chromeos/drive/fake_file_system.h',
       'browser/chromeos/drive/fake_file_system_unittest.cc',
-      'browser/chromeos/drive/file_system/copy_operation_unittest.cc',
-      'browser/chromeos/drive/file_system/create_directory_operation_unittest.cc',
-      'browser/chromeos/drive/file_system/create_file_operation_unittest.cc',
-      'browser/chromeos/drive/file_system/download_operation_unittest.cc',
-      'browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc',
-      'browser/chromeos/drive/file_system/move_operation_unittest.cc',
-      'browser/chromeos/drive/file_system/open_file_operation_unittest.cc',
-      'browser/chromeos/drive/file_system/operation_test_base.cc',
-      'browser/chromeos/drive/file_system/operation_test_base.h',
-      'browser/chromeos/drive/file_system/remove_operation_unittest.cc',
-      'browser/chromeos/drive/file_system/search_operation_unittest.cc',
-      'browser/chromeos/drive/file_system/set_property_operation_unittest.cc',
-      'browser/chromeos/drive/file_system/touch_operation_unittest.cc',
-      'browser/chromeos/drive/file_system/truncate_operation_unittest.cc',
       'browser/chromeos/drive/file_system_unittest.cc',
       'browser/chromeos/drive/file_system_util_unittest.cc',
       'browser/chromeos/drive/file_task_executor_unittest.cc',
-      'browser/chromeos/drive/file_write_watcher_unittest.cc',
       'browser/chromeos/drive/fileapi/fileapi_worker_unittest.cc',
       'browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc',
       'browser/chromeos/drive/remove_stale_cache_files_unittest.cc',
diff --git a/components/drive.gypi b/components/drive.gypi
index e01ada2..55266d4 100644
--- a/components/drive.gypi
+++ b/components/drive.gypi
@@ -52,8 +52,40 @@
         'drive/file_change.h',
         'drive/file_errors.cc',
         'drive/file_errors.h',
+        'drive/file_system/copy_operation.cc',
+        'drive/file_system/copy_operation.h',
+        'drive/file_system/create_directory_operation.cc',
+        'drive/file_system/create_directory_operation.h',
+        'drive/file_system/create_file_operation.cc',
+        'drive/file_system/create_file_operation.h',
+        'drive/file_system/download_operation.cc',
+        'drive/file_system/download_operation.h',
+        'drive/file_system/get_file_for_saving_operation.cc',
+        'drive/file_system/get_file_for_saving_operation.h',
+        'drive/file_system/move_operation.cc',
+        'drive/file_system/move_operation.h',
+        'drive/file_system/open_file_operation.cc',
+        'drive/file_system/open_file_operation.h',
+        'drive/file_system/operation_delegate.cc',
+        'drive/file_system/operation_delegate.h',
+        'drive/file_system/remove_operation.cc',
+        'drive/file_system/remove_operation.h',
+        'drive/file_system/search_operation.cc',
+        'drive/file_system/search_operation.h',
+        'drive/file_system/set_property_operation.cc',
+        'drive/file_system/set_property_operation.h',
+        'drive/file_system/touch_operation.cc',
+        'drive/file_system/touch_operation.h',
+        'drive/file_system/truncate_operation.cc',
+        'drive/file_system/truncate_operation.h',
         'drive/file_system_core_util.cc',
         'drive/file_system_core_util.h',
+        'drive/file_system_interface.cc',
+        'drive/file_system_interface.h',
+        'drive/file_system_metadata.cc',
+        'drive/file_system_metadata.h',
+        'drive/file_write_watcher.cc',
+        'drive/file_write_watcher.h',
         'drive/job_list.cc',
         'drive/job_list.h',
         'drive/job_queue.cc',
diff --git a/components/drive/BUILD.gn b/components/drive/BUILD.gn
index 93f8320..4567878 100644
--- a/components/drive/BUILD.gn
+++ b/components/drive/BUILD.gn
@@ -31,8 +31,40 @@ source_set("drive") {
     "file_change.h",
     "file_errors.cc",
     "file_errors.h",
+    "file_system/copy_operation.cc",
+    "file_system/copy_operation.h",
+    "file_system/create_directory_operation.cc",
+    "file_system/create_directory_operation.h",
+    "file_system/create_file_operation.cc",
+    "file_system/create_file_operation.h",
+    "file_system/download_operation.cc",
+    "file_system/download_operation.h",
+    "file_system/get_file_for_saving_operation.cc",
+    "file_system/get_file_for_saving_operation.h",
+    "file_system/move_operation.cc",
+    "file_system/move_operation.h",
+    "file_system/open_file_operation.cc",
+    "file_system/open_file_operation.h",
+    "file_system/operation_delegate.cc",
+    "file_system/operation_delegate.h",
+    "file_system/remove_operation.cc",
+    "file_system/remove_operation.h",
+    "file_system/search_operation.cc",
+    "file_system/search_operation.h",
+    "file_system/set_property_operation.cc",
+    "file_system/set_property_operation.h",
+    "file_system/touch_operation.cc",
+    "file_system/touch_operation.h",
+    "file_system/truncate_operation.cc",
+    "file_system/truncate_operation.h",
     "file_system_core_util.cc",
     "file_system_core_util.h",
+    "file_system_interface.cc",
+    "file_system_interface.h",
+    "file_system_metadata.cc",
+    "file_system_metadata.h",
+    "file_write_watcher.cc",
+    "file_write_watcher.h",
     "job_list.cc",
     "job_list.h",
     "job_queue.cc",
diff --git a/components/drive/DEPS b/components/drive/DEPS
index 888602d..9f76475 100644
--- a/components/drive/DEPS
+++ b/components/drive/DEPS
@@ -18,7 +18,19 @@ specific_include_rules = {
 
   # The following test dependencies should be removed to fully componentize this
   # directory. crbug.com/498951
-  r"(drive_test_util\.h"
+  r"(copy_operation_unittest\.cc"
+  r"|create_directory_operation_unittest\.cc"
+  r"|create_file_operation_unittest\.cc"
+  r"|download_operation_unittest\.cc"
+  r"|drive_test_util\.h"
+  r"|get_file_for_saving_operation_unittest\.cc"
+  r"|move_operation_unittest\.cc"
+  r"|open_file_operation_unittest\.cc"
+  r"|operation_test_base\.cc"
+  r"|remove_operation_unittest\.cc"
+  r"|search_operation_unittest\.cc"
+  r"|set_property_operation_unittest\.cc"
+  r"|truncate_operation_unittest\.cc"
   r")": [
     "+content/public/test/test_utils.h",
   ],
@@ -29,18 +41,27 @@ specific_include_rules = {
   r"|change_list_processor_unittest.cc"
   r"|file_cache_unittest.cc"
   r"|file_system_core_util_unittest.cc"
+  r"|file_write_watcher_unittest.cc"
   r"|job_scheduler_unittest.cc"
+  r"|operation_test_base\.h"
   r"|resource_metadata_storage_unittest.cc"
   r"|resource_metadata_unittest.cc"
   r")": [
     "+content/public/test/test_browser_thread_bundle.h",
   ],
 
+  # The following test dependencies should be removed to fully componentize this
+  # directory. crbug.com/498951
+  r"(file_write_watcher_unittest\.cc"
+  r"|get_file_for_saving_operation_unittest\.cc"
+  r"|operation_test_base\.cc"
+  r")": [
+    "+content/public/browser/browser_thread.h",
+  ],
+
   # The dependency below is ok and can stay here for the long-term, because it
   # is guarded by #if defined(OS_CHROMEOS) in the source code.
-  r"(drive_test_util.h"
-  r"|file_cache.cc"
-  r")": [
+  "file_cache\.h": [
     "+third_party/cros_system_api/constants/cryptohome.h",
   ],
 }
diff --git a/components/drive/drive_test_util.h b/components/drive/drive_test_util.h
index 41b5acb..327dc15 100644
--- a/components/drive/drive_test_util.h
+++ b/components/drive/drive_test_util.h
@@ -7,15 +7,13 @@
 
 #include <string>
 
+#include "components/drive/file_cache.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/test_util.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/test_completion_callback.h"
-#if defined(OS_CHROMEOS)
-#include "third_party/cros_system_api/constants/cryptohome.h"
-#endif
 
 class PrefRegistrySimple;
 
@@ -28,11 +26,7 @@ namespace drive {
 namespace test_util {
 
 // Disk space size used by FakeFreeDiskSpaceGetter.
-#if defined(OS_CHROMEOS)
-const int64 kLotsOfSpace = cryptohome::kMinFreeSpaceInBytes * 10;
-#else
-const int64 kLotsOfSpace = 5ull * 1024ull * 1024ull * 1024ull;  // 5GB
-#endif
+const int64 kLotsOfSpace = drive::internal::kMinFreeSpaceInBytes * 10;
 
 // Helper to destroy objects which needs Destroy() to be called on destruction.
 // Note: When using this helper, you should destruct objects before
diff --git a/components/drive/file_cache.cc b/components/drive/file_cache.cc
index 0638844..572316c 100644
--- a/components/drive/file_cache.cc
+++ b/components/drive/file_cache.cc
@@ -25,9 +25,6 @@
 #include "net/base/filename_util.h"
 #include "net/base/mime_sniffer.h"
 #include "net/base/mime_util.h"
-#if defined(OS_CHROMEOS)
-#include "third_party/cros_system_api/constants/cryptohome.h"
-#endif
 
 namespace drive {
 namespace internal {
@@ -581,12 +578,7 @@ bool FileCache::HasEnoughSpaceFor(int64 num_bytes,
     free_space = base::SysInfo::AmountOfFreeDiskSpace(path);
 
   // Subtract this as if this portion does not exist.
-#if defined(OS_CHROMEOS)
-  const int64 kMinFreeBytes = cryptohome::kMinFreeSpaceInBytes;
-#else
-  const int64 kMinFreeBytes = 512ull * 1024ull * 1024ull;  // 512MB
-#endif
-  free_space -= kMinFreeBytes;
+  free_space -= drive::internal::kMinFreeSpaceInBytes;
   return (free_space >= num_bytes);
 }
 
diff --git a/components/drive/file_cache.h b/components/drive/file_cache.h
index c4345ad..b205a77 100644
--- a/components/drive/file_cache.h
+++ b/components/drive/file_cache.h
@@ -15,6 +15,9 @@
 #include "base/threading/thread_checker.h"
 #include "components/drive/file_errors.h"
 #include "components/drive/resource_metadata_storage.h"
+#if defined(OS_CHROMEOS)
+#include "third_party/cros_system_api/constants/cryptohome.h"
+#endif
 
 namespace base {
 class ScopedClosureRunner;
@@ -25,6 +28,12 @@ namespace drive {
 
 namespace internal {
 
+#if defined(OS_CHROMEOS)
+  const int64 kMinFreeSpaceInBytes = cryptohome::kMinFreeSpaceInBytes;
+#else
+  const int64 kMinFreeSpaceInBytes = 512ull * 1024ull * 1024ull;  // 512MB
+#endif
+
 // Interface class used for getting the free disk space. Tests can inject an
 // implementation that reports fake free disk space.
 class FreeDiskSpaceGetterInterface {
@@ -67,7 +76,7 @@ class FileCache {
   bool IsUnderFileCacheDirectory(const base::FilePath& path) const;
 
   // Frees up disk space to store a file with |num_bytes| size content, while
-  // keeping cryptohome::kMinFreeSpaceInBytes bytes on the disk, if needed.
+  // keeping drive::internal::kMinFreeSpaceInBytes bytes on the disk, if needed.
   // Returns true if we successfully manage to have enough space, otherwise
   // false.
   bool FreeDiskSpaceIfNeededFor(int64 num_bytes);
@@ -157,7 +166,8 @@ class FileCache {
   void DestroyOnBlockingPool();
 
   // Returns true if we have sufficient space to store the given number of
-  // bytes, while keeping cryptohome::kMinFreeSpaceInBytes bytes on the disk.
+  // bytes, while keeping drive::internal::kMinFreeSpaceInBytes bytes on the
+  // disk.
   bool HasEnoughSpaceFor(int64 num_bytes, const base::FilePath& path);
 
   // Renames cache files from old "prefix:id.md5" format to the new format.
diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.cc b/components/drive/file_system/copy_operation.cc
index ace52a5..595e8e1 100644
--- a/chrome/browser/chromeos/drive/file_system/copy_operation.cc
+++ b/components/drive/file_system/copy_operation.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/copy_operation.h"
+#include "components/drive/file_system/copy_operation.h"
 
 #include <string>
 
 #include "base/task_runner_util.h"
-#include "chrome/browser/chromeos/drive/file_system/create_file_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_api_util.h"
 #include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system/create_file_operation.h"
+#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_entry_conversion.h"
diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.h b/components/drive/file_system/copy_operation.h
index 2cb3e64..1f92bd4 100644
--- a/chrome/browser/chromeos/drive/file_system/copy_operation.h
+++ b/components/drive/file_system/copy_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_COPY_OPERATION_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_COPY_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_COPY_OPERATION_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_COPY_OPERATION_H_
 
 #include <string>
 #include <vector>
@@ -178,4 +178,4 @@ class CopyOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_COPY_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_COPY_OPERATION_H_
diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc b/components/drive/file_system/copy_operation_unittest.cc
index d5c2ae4..3491746 100644
--- a/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc
+++ b/components/drive/file_system/copy_operation_unittest.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/chromeos/drive/file_system/copy_operation.h"
+#include "components/drive/file_system/copy_operation.h"
 
 #include "base/files/file_util.h"
 #include "base/task_runner_util.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "components/drive/drive_api_util.h"
 #include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system/operation_test_base.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/resource_metadata.h"
 #include "components/drive/service/fake_drive_service.h"
diff --git a/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc b/components/drive/file_system/create_directory_operation.cc
index 49a18e0..a06ef5b 100644
--- a/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc
+++ b/components/drive/file_system/create_directory_operation.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/create_directory_operation.h"
+#include "components/drive/file_system/create_directory_operation.h"
 
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_metadata.h"
diff --git a/chrome/browser/chromeos/drive/file_system/create_directory_operation.h b/components/drive/file_system/create_directory_operation.h
index b06b6c9..8467db9 100644
--- a/chrome/browser/chromeos/drive/file_system/create_directory_operation.h
+++ b/components/drive/file_system/create_directory_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_CREATE_DIRECTORY_OPERATION_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_CREATE_DIRECTORY_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_CREATE_DIRECTORY_OPERATION_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_CREATE_DIRECTORY_OPERATION_H_
 
 #include <set>
 
@@ -76,4 +76,4 @@ class CreateDirectoryOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_CREATE_DIRECTORY_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_CREATE_DIRECTORY_OPERATION_H_
diff --git a/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc b/components/drive/file_system/create_directory_operation_unittest.cc
index 01ba6bd..df70157 100644
--- a/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc
+++ b/components/drive/file_system/create_directory_operation_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/create_directory_operation.h"
+#include "components/drive/file_system/create_directory_operation.h"
 
-#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
+#include "components/drive/file_system/operation_test_base.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/create_file_operation.cc b/components/drive/file_system/create_file_operation.cc
index 4827a55..19a238e 100644
--- a/chrome/browser/chromeos/drive/file_system/create_file_operation.cc
+++ b/components/drive/file_system/create_file_operation.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/chromeos/drive/file_system/create_file_operation.h"
+#include "components/drive/file_system/create_file_operation.h"
 
 #include <string>
 
 #include "base/files/file_util.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_metadata.h"
 #include "net/base/mime_util.h"
diff --git a/chrome/browser/chromeos/drive/file_system/create_file_operation.h b/components/drive/file_system/create_file_operation.h
index 16b39f0..b43132f 100644
--- a/chrome/browser/chromeos/drive/file_system/create_file_operation.h
+++ b/components/drive/file_system/create_file_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_CREATE_FILE_OPERATION_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_CREATE_FILE_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_CREATE_FILE_OPERATION_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_CREATE_FILE_OPERATION_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ -73,4 +73,4 @@ class CreateFileOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_CREATE_FILE_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_CREATE_FILE_OPERATION_H_
diff --git a/chrome/browser/chromeos/drive/file_system/create_file_operation_unittest.cc b/components/drive/file_system/create_file_operation_unittest.cc
index af8ed46..79b4456 100644
--- a/chrome/browser/chromeos/drive/file_system/create_file_operation_unittest.cc
+++ b/components/drive/file_system/create_file_operation_unittest.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/chromeos/drive/file_system/create_file_operation.h"
+#include "components/drive/file_system/create_file_operation.h"
 
-#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system/operation_test_base.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/download_operation.cc b/components/drive/file_system/download_operation.cc
index 6f226ac..150009c 100644
--- a/chrome/browser/chromeos/drive/file_system/download_operation.cc
+++ b/components/drive/file_system/download_operation.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/download_operation.h"
+#include "components/drive/file_system/download_operation.h"
 
 #include "base/callback_helpers.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/task_runner_util.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_metadata.h"
diff --git a/chrome/browser/chromeos/drive/file_system/download_operation.h b/components/drive/file_system/download_operation.h
index cbf569f..e45902b 100644
--- a/chrome/browser/chromeos/drive/file_system/download_operation.h
+++ b/components/drive/file_system/download_operation.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_CHROMEOS_DRIVE_FILE_SYSTEM_DOWNLOAD_OPERATION_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_DOWNLOAD_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_DOWNLOAD_OPERATION_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_DOWNLOAD_OPERATION_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system_interface.h"
 #include "components/drive/job_list.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
@@ -130,4 +130,4 @@ class DownloadOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_DOWNLOAD_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_DOWNLOAD_OPERATION_H_
diff --git a/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc b/components/drive/file_system/download_operation_unittest.cc
index e94dadf..b4dcf53 100644
--- a/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc
+++ b/components/drive/file_system/download_operation_unittest.cc
@@ -2,21 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/download_operation.h"
+#include "components/drive/file_system/download_operation.h"
 
 #include "base/files/file_util.h"
 #include "base/task_runner_util.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "components/drive/fake_free_disk_space_getter.h"
 #include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system/operation_test_base.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.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"
-#include "third_party/cros_system_api/constants/cryptohome.h"
 
 namespace drive {
 namespace file_system {
@@ -43,7 +42,7 @@ TEST_F(DownloadOperationTest,
 
   // Pretend we have enough space.
   fake_free_disk_space_getter()->set_default_value(
-      file_size + cryptohome::kMinFreeSpaceInBytes);
+      file_size + drive::internal::kMinFreeSpaceInBytes);
 
   FileError error = FILE_ERROR_FAILED;
   base::FilePath file_path;
@@ -119,7 +118,7 @@ TEST_F(DownloadOperationTest,
   // but then start reporting we have space. This is to emulate that
   // the disk space was freed up by removing temporary files.
   fake_free_disk_space_getter()->set_default_value(
-      file_size + cryptohome::kMinFreeSpaceInBytes);
+      file_size + drive::internal::kMinFreeSpaceInBytes);
   fake_free_disk_space_getter()->PushFakeValue(0);
 
   operation_->EnsureFileDownloadedByPath(
@@ -161,9 +160,9 @@ TEST_F(DownloadOperationTest,
   // the disk space becomes full after the file is downloaded for some reason
   // (ex. the actual file was larger than the expected size).
   fake_free_disk_space_getter()->PushFakeValue(
-      file_size + cryptohome::kMinFreeSpaceInBytes);
+      file_size + drive::internal::kMinFreeSpaceInBytes);
   fake_free_disk_space_getter()->set_default_value(
-      cryptohome::kMinFreeSpaceInBytes - 1);
+      drive::internal::kMinFreeSpaceInBytes - 1);
 
   FileError error = FILE_ERROR_OK;
   base::FilePath file_path;
diff --git a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation.cc b/components/drive/file_system/get_file_for_saving_operation.cc
index f3c6c4f..30aefd6 100644
--- a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation.cc
+++ b/components/drive/file_system/get_file_for_saving_operation.cc
@@ -2,19 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation.h"
+#include "components/drive/file_system/get_file_for_saving_operation.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
-#include "chrome/browser/chromeos/drive/file_system/create_file_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/download_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
-#include "chrome/browser/chromeos/drive/file_write_watcher.h"
 #include "components/drive/event_logger.h"
 #include "components/drive/file_cache.h"
+#include "components/drive/file_system/create_file_operation.h"
+#include "components/drive/file_system/download_operation.h"
+#include "components/drive/file_system/operation_delegate.h"
+#include "components/drive/file_write_watcher.h"
 #include "components/drive/job_scheduler.h"
-#include "content/public/browser/browser_thread.h"
 
 namespace drive {
 namespace file_system {
diff --git a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation.h b/components/drive/file_system/get_file_for_saving_operation.h
index 5af2a1d..9b2fc7c 100644
--- a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation.h
+++ b/components/drive/file_system/get_file_for_saving_operation.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_GET_FILE_FOR_SAVING_OPERATION_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_GET_FILE_FOR_SAVING_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_GET_FILE_FOR_SAVING_OPERATION_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_GET_FILE_FOR_SAVING_OPERATION_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system_interface.h"
 
 namespace base {
 class FilePath;
@@ -106,4 +106,4 @@ class GetFileForSavingOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_GET_FILE_FOR_SAVING_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_GET_FILE_FOR_SAVING_OPERATION_H_
diff --git a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc b/components/drive/file_system/get_file_for_saving_operation_unittest.cc
index 4feac3a..984d0b6 100644
--- a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc
+++ b/components/drive/file_system/get_file_for_saving_operation_unittest.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation.h"
+#include "components/drive/file_system/get_file_for_saving_operation.h"
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/run_loop.h"
 #include "base/task_runner_util.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
-#include "chrome/browser/chromeos/drive/file_write_watcher.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_change.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system/operation_test_base.h"
+#include "components/drive/file_write_watcher.h"
 #include "components/drive/job_scheduler.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_utils.h"
diff --git a/chrome/browser/chromeos/drive/file_system/move_operation.cc b/components/drive/file_system/move_operation.cc
index a4bb710..ff1edd6 100644
--- a/chrome/browser/chromeos/drive/file_system/move_operation.cc
+++ b/components/drive/file_system/move_operation.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/move_operation.h"
+#include "components/drive/file_system/move_operation.h"
 
 #include "base/sequenced_task_runner.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_metadata.h"
 
diff --git a/chrome/browser/chromeos/drive/file_system/move_operation.h b/components/drive/file_system/move_operation.h
index 63ca40f..db6cee8 100644
--- a/chrome/browser/chromeos/drive/file_system/move_operation.h
+++ b/components/drive/file_system/move_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_MOVE_OPERATION_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_MOVE_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_MOVE_OPERATION_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_MOVE_OPERATION_H_
 
 #include <set>
 
@@ -76,4 +76,4 @@ class MoveOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_MOVE_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_MOVE_OPERATION_H_
diff --git a/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc b/components/drive/file_system/move_operation_unittest.cc
index a43e024..4f097b3 100644
--- a/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc
+++ b/components/drive/file_system/move_operation_unittest.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/chromeos/drive/file_system/move_operation.h"
+#include "components/drive/file_system/move_operation.h"
 
-#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system/operation_test_base.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/open_file_operation.cc b/components/drive/file_system/open_file_operation.cc
index a2ca4e4..54da778 100644
--- a/chrome/browser/chromeos/drive/file_system/open_file_operation.cc
+++ b/components/drive/file_system/open_file_operation.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/open_file_operation.h"
+#include "components/drive/file_system/open_file_operation.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -11,12 +11,12 @@
 #include "base/logging.h"
 #include "base/task_runner_util.h"
 #include "base/thread_task_runner_handle.h"
-#include "chrome/browser/chromeos/drive/file_system/create_file_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/download_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_cache.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system/create_file_operation.h"
+#include "components/drive/file_system/download_operation.h"
+#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/job_scheduler.h"
 
 namespace drive {
diff --git a/chrome/browser/chromeos/drive/file_system/open_file_operation.h b/components/drive/file_system/open_file_operation.h
index 19c8af7..4f0f554 100644
--- a/chrome/browser/chromeos/drive/file_system/open_file_operation.h
+++ b/components/drive/file_system/open_file_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPEN_FILE_OPERATION_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPEN_FILE_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_OPEN_FILE_OPERATION_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_OPEN_FILE_OPERATION_H_
 
 #include <map>
 
@@ -12,8 +12,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system_interface.h"
 
 namespace base {
 class FilePath;
@@ -106,4 +106,4 @@ class OpenFileOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPEN_FILE_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_OPEN_FILE_OPERATION_H_
diff --git a/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc b/components/drive/file_system/open_file_operation_unittest.cc
index 1829ba4..2e6f674 100644
--- a/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc
+++ b/components/drive/file_system/open_file_operation_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/chromeos/drive/file_system/open_file_operation.h"
+#include "components/drive/file_system/open_file_operation.h"
 
 #include <map>
 
@@ -10,11 +10,11 @@
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task_runner_util.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system/operation_test_base.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/operation_delegate.cc b/components/drive/file_system/operation_delegate.cc
index 359a65f..f6e2dad 100644
--- a/chrome/browser/chromeos/drive/file_system/operation_delegate.cc
+++ b/components/drive/file_system/operation_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
+#include "components/drive/file_system/operation_delegate.h"
 
 namespace drive {
 namespace file_system {
diff --git a/chrome/browser/chromeos/drive/file_system/operation_delegate.h b/components/drive/file_system/operation_delegate.h
index 96c768c..24f50a8 100644
--- a/chrome/browser/chromeos/drive/file_system/operation_delegate.h
+++ b/components/drive/file_system/operation_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPERATION_DELEGATE_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPERATION_DELEGATE_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_OPERATION_DELEGATE_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_OPERATION_DELEGATE_H_
 
 #include "components/drive/file_errors.h"
 
@@ -56,4 +56,4 @@ class OperationDelegate {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPERATION_DELEGATE_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_OPERATION_DELEGATE_H_
diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.cc b/components/drive/file_system/operation_test_base.cc
index ff108b06..603aed4 100644
--- a/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
+++ b/components/drive/file_system/operation_test_base.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
+#include "components/drive/file_system/operation_test_base.h"
 
 #include "base/prefs/testing_pref_service.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "components/drive/change_list_loader.h"
 #include "components/drive/event_logger.h"
 #include "components/drive/fake_free_disk_space_getter.h"
 #include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_metadata.h"
 #include "components/drive/service/fake_drive_service.h"
diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.h b/components/drive/file_system/operation_test_base.h
index 50a95b1..bfdece00 100644
--- a/chrome/browser/chromeos/drive/file_system/operation_test_base.h
+++ b/components/drive/file_system/operation_test_base.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPERATION_TEST_BASE_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPERATION_TEST_BASE_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_OPERATION_TEST_BASE_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_OPERATION_TEST_BASE_H_
 
 #include <set>
 
 #include "base/files/scoped_temp_dir.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_test_util.h"
 #include "components/drive/file_change.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system/operation_delegate.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -163,4 +163,4 @@ class OperationTestBase : public testing::Test {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPERATION_TEST_BASE_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_OPERATION_TEST_BASE_H_
diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation.cc b/components/drive/file_system/remove_operation.cc
index 1249305..9cfc56c 100644
--- a/chrome/browser/chromeos/drive/file_system/remove_operation.cc
+++ b/components/drive/file_system/remove_operation.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
+#include "components/drive/file_system/remove_operation.h"
 
 #include "base/sequenced_task_runner.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_metadata.h"
diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation.h b/components/drive/file_system/remove_operation.h
index a9b9e2d..538a91c 100644
--- a/chrome/browser/chromeos/drive/file_system/remove_operation.h
+++ b/components/drive/file_system/remove_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_REMOVE_OPERATION_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_REMOVE_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_REMOVE_OPERATION_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_REMOVE_OPERATION_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ -74,4 +74,4 @@ class RemoveOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_REMOVE_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_REMOVE_OPERATION_H_
diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc b/components/drive/file_system/remove_operation_unittest.cc
index 3bbba44..5401275 100644
--- a/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc
+++ b/components/drive/file_system/remove_operation_unittest.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/chromeos/drive/file_system/remove_operation.h"
+#include "components/drive/file_system/remove_operation.h"
 
-#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "components/drive/file_change.h"
+#include "components/drive/file_system/operation_test_base.h"
 #include "components/drive/file_system_core_util.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/components/drive/file_system/search_operation.cc
index 02e4c5a..a0be870 100644
--- a/chrome/browser/chromeos/drive/file_system/search_operation.cc
+++ b/components/drive/file_system/search_operation.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/search_operation.h"
+#include "components/drive/file_system/search_operation.h"
 
 #include <string>
 #include <vector>
diff --git a/chrome/browser/chromeos/drive/file_system/search_operation.h b/components/drive/file_system/search_operation.h
index 6e896ec..920c52b 100644
--- a/chrome/browser/chromeos/drive/file_system/search_operation.h
+++ b/components/drive/file_system/search_operation.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_SEARCH_OPERATION_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_SEARCH_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_SEARCH_OPERATION_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_SEARCH_OPERATION_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system_interface.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 namespace base {
@@ -83,4 +83,4 @@ class SearchOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_SEARCH_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_SEARCH_OPERATION_H_
diff --git a/chrome/browser/chromeos/drive/file_system/search_operation_unittest.cc b/components/drive/file_system/search_operation_unittest.cc
index 1ba8339..83ab746 100644
--- a/chrome/browser/chromeos/drive/file_system/search_operation_unittest.cc
+++ b/components/drive/file_system/search_operation_unittest.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/search_operation.h"
+#include "components/drive/file_system/search_operation.h"
 
 #include "base/callback_helpers.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "components/drive/change_list_loader.h"
+#include "components/drive/file_system/operation_test_base.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/drive_api_parser.h"
diff --git a/chrome/browser/chromeos/drive/file_system/set_property_operation.cc b/components/drive/file_system/set_property_operation.cc
index a70a723..0620f2e 100644
--- a/chrome/browser/chromeos/drive/file_system/set_property_operation.cc
+++ b/components/drive/file_system/set_property_operation.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/chromeos/drive/file_system/set_property_operation.h"
+#include "components/drive/file_system/set_property_operation.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/sequenced_task_runner.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_metadata.h"
 
diff --git a/chrome/browser/chromeos/drive/file_system/set_property_operation.h b/components/drive/file_system/set_property_operation.h
index ff006b8..2e04441 100644
--- a/chrome/browser/chromeos/drive/file_system/set_property_operation.h
+++ b/components/drive/file_system/set_property_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_SET_PROPERTY_OPERATION_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_SET_PROPERTY_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_SET_PROPERTY_OPERATION_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_SET_PROPERTY_OPERATION_H_
 
 #include <string>
 
@@ -67,4 +67,4 @@ class SetPropertyOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_SET_PROPERTY_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_SET_PROPERTY_OPERATION_H_
diff --git a/chrome/browser/chromeos/drive/file_system/set_property_operation_unittest.cc b/components/drive/file_system/set_property_operation_unittest.cc
index 402de23..093fbb2 100644
--- a/chrome/browser/chromeos/drive/file_system/set_property_operation_unittest.cc
+++ b/components/drive/file_system/set_property_operation_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/set_property_operation.h"
+#include "components/drive/file_system/set_property_operation.h"
 
 #include "base/files/file_path.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system/operation_test_base.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/drive_api_requests.h"
 #include "google_apis/drive/test_util.h"
diff --git a/chrome/browser/chromeos/drive/file_system/touch_operation.cc b/components/drive/file_system/touch_operation.cc
index c7b0711..63272d7 100644
--- a/chrome/browser/chromeos/drive/file_system/touch_operation.cc
+++ b/components/drive/file_system/touch_operation.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/chromeos/drive/file_system/touch_operation.h"
+#include "components/drive/file_system/touch_operation.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/sequenced_task_runner.h"
 #include "base/time/time.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "components/drive/file_change.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_metadata.h"
 
diff --git a/chrome/browser/chromeos/drive/file_system/touch_operation.h b/components/drive/file_system/touch_operation.h
index fcba888..46c53e7 100644
--- a/chrome/browser/chromeos/drive/file_system/touch_operation.h
+++ b/components/drive/file_system/touch_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_TOUCH_OPERATION_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_TOUCH_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_TOUCH_OPERATION_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_TOUCH_OPERATION_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ -65,4 +65,4 @@ class TouchOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_TOUCH_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_TOUCH_OPERATION_H_
diff --git a/chrome/browser/chromeos/drive/file_system/touch_operation_unittest.cc b/components/drive/file_system/touch_operation_unittest.cc
index c4481ea..c7b9cfe 100644
--- a/chrome/browser/chromeos/drive/file_system/touch_operation_unittest.cc
+++ b/components/drive/file_system/touch_operation_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/touch_operation.h"
+#include "components/drive/file_system/touch_operation.h"
 
 #include "base/files/file_path.h"
 #include "base/time/time.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system/operation_test_base.h"
 #include "components/drive/resource_metadata.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/drive/file_system/truncate_operation.cc b/components/drive/file_system/truncate_operation.cc
index 69e6434..7ab44b4 100644
--- a/chrome/browser/chromeos/drive/file_system/truncate_operation.cc
+++ b/components/drive/file_system/truncate_operation.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system/truncate_operation.h"
+#include "components/drive/file_system/truncate_operation.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ -12,11 +12,11 @@
 #include "base/sequenced_task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/thread_task_runner_handle.h"
-#include "chrome/browser/chromeos/drive/file_system/download_operation.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_cache.h"
 #include "components/drive/file_errors.h"
+#include "components/drive/file_system/download_operation.h"
+#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/job_scheduler.h"
 
 namespace drive {
diff --git a/chrome/browser/chromeos/drive/file_system/truncate_operation.h b/components/drive/file_system/truncate_operation.h
index dcdd1b8..ff22806 100644
--- a/chrome/browser/chromeos/drive/file_system/truncate_operation.h
+++ b/components/drive/file_system/truncate_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_TRUNCATE_OPERATION_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_TRUNCATE_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_TRUNCATE_OPERATION_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_TRUNCATE_OPERATION_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ -85,4 +85,4 @@ class TruncateOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_TRUNCATE_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_TRUNCATE_OPERATION_H_
diff --git a/chrome/browser/chromeos/drive/file_system/truncate_operation_unittest.cc b/components/drive/file_system/truncate_operation_unittest.cc
index 98ab826..31c5ad5 100644
--- a/chrome/browser/chromeos/drive/file_system/truncate_operation_unittest.cc
+++ b/components/drive/file_system/truncate_operation_unittest.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/chromeos/drive/file_system/truncate_operation.h"
+#include "components/drive/file_system/truncate_operation.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/task_runner_util.h"
-#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/fake_free_disk_space_getter.h"
+#include "components/drive/file_system/operation_test_base.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/chromeos/drive/file_system_interface.cc b/components/drive/file_system_interface.cc
index fb91a44..931b680 100644
--- a/chrome/browser/chromeos/drive/file_system_interface.cc
+++ b/components/drive/file_system_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/chromeos/drive/file_system_interface.h"
+#include "components/drive/file_system_interface.h"
 
 namespace drive {
 
diff --git a/chrome/browser/chromeos/drive/file_system_interface.h b/components/drive/file_system_interface.h
index f113b10..aa6b099 100644
--- a/chrome/browser/chromeos/drive/file_system_interface.h
+++ b/components/drive/file_system_interface.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_INTERFACE_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_INTERFACE_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_INTERFACE_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_INTERFACE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/drive/file_system_metadata.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_system_metadata.h"
 #include "components/drive/resource_metadata.h"
 #include "google_apis/drive/base_requests.h"
 #include "google_apis/drive/drive_api_requests.h"
@@ -471,4 +471,4 @@ class FileSystemInterface {
 
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_INTERFACE_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_INTERFACE_H_
diff --git a/chrome/browser/chromeos/drive/file_system_metadata.cc b/components/drive/file_system_metadata.cc
index 412b93a..7c53d53 100644
--- a/chrome/browser/chromeos/drive/file_system_metadata.cc
+++ b/components/drive/file_system_metadata.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_system_metadata.h"
+#include "components/drive/file_system_metadata.h"
 
 namespace drive {
 
diff --git a/chrome/browser/chromeos/drive/file_system_metadata.h b/components/drive/file_system_metadata.h
index ae81c1d..199f106 100644
--- a/chrome/browser/chromeos/drive/file_system_metadata.h
+++ b/components/drive/file_system_metadata.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_METADATA_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_METADATA_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_METADATA_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_METADATA_H_
 
 #include "base/basictypes.h"
 #include "base/time/time.h"
@@ -32,4 +32,4 @@ struct FileSystemMetadata {
 
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_METADATA_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_METADATA_H_
diff --git a/chrome/browser/chromeos/drive/file_write_watcher.cc b/components/drive/file_write_watcher.cc
index a7a75aa..c1b4815 100644
--- a/chrome/browser/chromeos/drive/file_write_watcher.cc
+++ b/components/drive/file_write_watcher.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/drive/file_write_watcher.h"
+#include "components/drive/file_write_watcher.h"
 
 #include <map>
 #include <vector>
diff --git a/chrome/browser/chromeos/drive/file_write_watcher.h b/components/drive/file_write_watcher.h
index 747723d..719a8b9 100644
--- a/chrome/browser/chromeos/drive/file_write_watcher.h
+++ b/components/drive/file_write_watcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_WRITE_WATCHER_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_WRITE_WATCHER_H_
+#ifndef COMPONENTS_DRIVE_FILE_WRITE_WATCHER_H_
+#define COMPONENTS_DRIVE_FILE_WRITE_WATCHER_H_
 
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
@@ -63,4 +63,4 @@ class FileWriteWatcher {
 }  // namespace internal
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_WRITE_WATCHER_H_
+#endif  // COMPONENTS_DRIVE_FILE_WRITE_WATCHER_H_
diff --git a/chrome/browser/chromeos/drive/file_write_watcher_unittest.cc b/components/drive/file_write_watcher_unittest.cc
index 3c9fe1c..abd9d51 100644
--- a/chrome/browser/chromeos/drive/file_write_watcher_unittest.cc
+++ b/components/drive/file_write_watcher_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/chromeos/drive/file_write_watcher.h"
+#include "components/drive/file_write_watcher.h"
 
 #include <set>