Move a subset of chrome/browser/chromeos/drive into components/drive

Moved: drive_pref_names.*, drive_test_util.*, file_change.*, file_error.*, local_file_reader.* Other changes: - Removed unnecessary include/dependency inside file_change.h - ChromeOS if-def guards in drive_test_util.h - Necessary DEPS tweaks Test steps: 1. Verify that things still build via GYP (and unit tests pass). $ GYP_DEFINES="use_goma=1 gomadir=... chromeos=1" gclient sync $ ninja -C out/Debug -j 150 chrome unit_tests \ interactive_ui_tests browser_tests drive $ out/Debug/unit_tests 2. git cl try TBR=satorux@chromium.org,benchan@chromium.org TEST=Please see "Test steps" above. BUG=257943, 498951 Review URL: https://codereview.chromium.org/1246753003 Cr-Commit-Position: refs/heads/master@{#342492}
author: lukasza <lukasza@chromium.org> 2015-08-07 17:36:39 -0700
committer: Commit bot <commit-bot@chromium.org> 2015-08-08 00:37:12 +0000
commit: 76b4a982964ffefeffa73af775f92d4c22d48791 (patch)
tree: 6c832c9985a8f3e6d70528027cfdf5dc0320c4f7
parent: 7a45b182edf6fc0e2e61e87b2a75653c88364184 (diff)
download: chromium_src-76b4a982964ffefeffa73af775f92d4c22d48791.zip
chromium_src-76b4a982964ffefeffa73af775f92d4c22d48791.tar.gz
chromium_src-76b4a982964ffefeffa73af775f92d4c22d48791.tar.bz2
121 files changed, 200 insertions, 171 deletions
diff --git a/chrome/browser/chromeos/DEPS b/chrome/browser/chromeos/DEPS
index a016e21..34b1851 100644
--- a/chrome/browser/chromeos/DEPS
+++ b/chrome/browser/chromeos/DEPS
@@ -1,5 +1,6 @@
 include_rules = [
   "+components/constrained_window",
+  "+components/drive/drive_pref_names.h",
   "+components/pairing",
   "+components/onc",
   "+components/ownership",
diff --git a/chrome/browser/chromeos/drive/change_list_loader.h b/chrome/browser/chromeos/drive/change_list_loader.h
index 612df97..d85458c 100644
--- a/chrome/browser/chromeos/drive/change_list_loader.h
+++ b/chrome/browser/chromeos/drive/change_list_loader.h
@@ -14,7 +14,7 @@
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.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/change_list_loader_unittest.cc b/chrome/browser/chromeos/drive/change_list_loader_unittest.cc
index fdff7e6..50e2183 100644
--- a/chrome/browser/chromeos/drive/change_list_loader_unittest.cc
+++ b/chrome/browser/chromeos/drive/change_list_loader_unittest.cc
@@ -12,13 +12,13 @@
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/change_list_loader_observer.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
+#include "components/drive/drive_test_util.h"
 #include "components/drive/event_logger.h"
+#include "components/drive/file_change.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/change_list_processor.cc b/chrome/browser/chromeos/drive/change_list_processor.cc
index e0ab157..8580e0d 100644
--- a/chrome/browser/chromeos/drive/change_list_processor.cc
+++ b/chrome/browser/chromeos/drive/change_list_processor.cc
@@ -7,12 +7,12 @@
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/cancellation_flag.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_api_util.h"
+#include "components/drive/file_change.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 namespace drive {
diff --git a/chrome/browser/chromeos/drive/change_list_processor.h b/chrome/browser/chromeos/drive/change_list_processor.h
index 83a056e..7816451 100644
--- a/chrome/browser/chromeos/drive/change_list_processor.h
+++ b/chrome/browser/chromeos/drive/change_list_processor.h
@@ -12,8 +12,8 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 #include "url/gurl.h"
 
 namespace base {
diff --git a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc
index 1b2bf3b..8c867be 100644
--- a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc
+++ b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc
@@ -8,13 +8,13 @@
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/drive_test_util.h"
+#include "components/drive/file_change.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/test_util.h"
diff --git a/chrome/browser/chromeos/drive/directory_loader.h b/chrome/browser/chromeos/drive/directory_loader.h
index 07fd18e..7e5afbf 100644
--- a/chrome/browser/chromeos/drive/directory_loader.h
+++ b/chrome/browser/chromeos/drive/directory_loader.h
@@ -16,8 +16,8 @@
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
+#include "components/drive/file_errors.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/directory_loader_unittest.cc b/chrome/browser/chromeos/drive/directory_loader_unittest.cc
index 525e569..b95d6f3 100644
--- a/chrome/browser/chromeos/drive/directory_loader_unittest.cc
+++ b/chrome/browser/chromeos/drive/directory_loader_unittest.cc
@@ -13,11 +13,11 @@
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/change_list_loader_observer.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
+#include "components/drive/drive_test_util.h"
 #include "components/drive/event_logger.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "components/drive/service/test_util.h"
diff --git a/chrome/browser/chromeos/drive/download_handler.h b/chrome/browser/chromeos/drive/download_handler.h
index e853290..9973224 100644
--- a/chrome/browser/chromeos/drive/download_handler.h
+++ b/chrome/browser/chromeos/drive/download_handler.h
@@ -7,8 +7,8 @@
 
 #include "base/callback_forward.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/download/all_download_item_notifier.h"
+#include "components/drive/file_errors.h"
 #include "content/public/browser/download_manager_delegate.h"
 
 class Profile;
diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc
index 6335da5..71e30fc 100644
--- a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc
+++ b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc
@@ -11,8 +11,8 @@
 #include "base/logging.h"
 #include "base/sequenced_task_runner.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
-#include "chrome/browser/chromeos/drive/local_file_reader.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/local_file_reader.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/drive/task_util.h"
 #include "net/base/io_buffer.h"
diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader.h b/chrome/browser/chromeos/drive/drive_file_stream_reader.h
index 9f2073e..0e15b1b 100644
--- a/chrome/browser/chromeos/drive/drive_file_stream_reader.h
+++ b/chrome/browser/chromeos/drive/drive_file_stream_reader.h
@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 #include "net/base/completion_callback.h"
 
diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc
index dcf7fdc..4ce17d8 100644
--- a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc
@@ -11,10 +11,10 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/chromeos/drive/fake_file_system.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
-#include "chrome/browser/chromeos/drive/local_file_reader.h"
+#include "components/drive/drive_test_util.h"
+#include "components/drive/local_file_reader.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/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc
index 1c35ecf..059d389 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service.cc
+++ b/chrome/browser/chromeos/drive/drive_integration_service.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/drive/debug_info_collector.h"
 #include "chrome/browser/chromeos/drive/download_handler.h"
-#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_system.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
@@ -36,6 +35,7 @@
 #include "components/drive/drive_api_util.h"
 #include "components/drive/drive_app_registry.h"
 #include "components/drive/drive_notification_manager.h"
+#include "components/drive/drive_pref_names.h"
 #include "components/drive/event_logger.h"
 #include "components/drive/service/drive_api_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
diff --git a/chrome/browser/chromeos/drive/drive_integration_service.h b/chrome/browser/chromeos/drive/drive_integration_service.h
index 71b75d3..9b31ad8 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service.h
+++ b/chrome/browser/chromeos/drive/drive_integration_service.h
@@ -10,10 +10,10 @@
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "components/drive/drive_notification_observer.h"
+#include "components/drive/file_errors.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/chromeos/drive/drive_integration_service_browsertest.cc b/chrome/browser/chromeos/drive/drive_integration_service_browsertest.cc
index ee26fda..28c90e1 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service_browsertest.cc
+++ b/chrome/browser/chromeos/drive/drive_integration_service_browsertest.cc
@@ -5,10 +5,10 @@
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "components/drive/drive_pref_names.h"
 
 namespace drive {
 
diff --git a/chrome/browser/chromeos/drive/fake_file_system.cc b/chrome/browser/chromeos/drive/fake_file_system.cc
index de2c0ee..10f27ef 100644
--- a/chrome/browser/chromeos/drive/fake_file_system.cc
+++ b/chrome/browser/chromeos/drive/fake_file_system.cc
@@ -10,10 +10,10 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_errors.h"
 #include "components/drive/service/drive_service_interface.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/drive/drive_api_parser.h"
diff --git a/chrome/browser/chromeos/drive/fake_file_system.h b/chrome/browser/chromeos/drive/fake_file_system.h
index e84d339..c7968ae 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_errors.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
+#include "components/drive/file_errors.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 namespace google_apis {
diff --git a/chrome/browser/chromeos/drive/fake_free_disk_space_getter.cc b/chrome/browser/chromeos/drive/fake_free_disk_space_getter.cc
index 17df38a..d2232d3 100644
--- a/chrome/browser/chromeos/drive/fake_free_disk_space_getter.cc
+++ b/chrome/browser/chromeos/drive/fake_free_disk_space_getter.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
+#include "components/drive/drive_test_util.h"
 
 namespace drive {
 
diff --git a/chrome/browser/chromeos/drive/file_cache.h b/chrome/browser/chromeos/drive/file_cache.h
index d2ba35a..8347b44 100644
--- a/chrome/browser/chromeos/drive/file_cache.h
+++ b/chrome/browser/chromeos/drive/file_cache.h
@@ -13,8 +13,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/resource_metadata_storage.h"
+#include "components/drive/file_errors.h"
 
 namespace base {
 class ScopedClosureRunner;
diff --git a/chrome/browser/chromeos/drive/file_cache_unittest.cc b/chrome/browser/chromeos/drive/file_cache_unittest.cc
index e601cfac..dbba973 100644
--- a/chrome/browser/chromeos/drive/file_cache_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_cache_unittest.cc
@@ -15,11 +15,11 @@
 #include "base/path_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/resource_metadata_storage.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/drive_test_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/drive/file_system.cc b/chrome/browser/chromeos/drive/file_system.cc
index fda0a69..a57b985 100644
--- a/chrome/browser/chromeos/drive/file_system.cc
+++ b/chrome/browser/chromeos/drive/file_system.cc
@@ -9,9 +9,7 @@
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/directory_loader.h"
-#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
-#include "chrome/browser/chromeos/drive/file_change.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"
@@ -32,6 +30,8 @@
 #include "chrome/browser/chromeos/drive/search_metadata.h"
 #include "chrome/browser/chromeos/drive/sync_client.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/drive_pref_names.h"
+#include "components/drive/file_change.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 namespace drive {
diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.cc b/chrome/browser/chromeos/drive/file_system/copy_operation.cc
index 606186e..b4bf551 100644
--- a/chrome/browser/chromeos/drive/file_system/copy_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/copy_operation.cc
@@ -8,7 +8,6 @@
 
 #include "base/task_runner_util.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/create_file_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
@@ -17,6 +16,7 @@
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_api_util.h"
+#include "components/drive/file_change.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 namespace drive {
diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.h b/chrome/browser/chromeos/drive/file_system/copy_operation.h
index af3bbdc..2cb3e64 100644
--- a/chrome/browser/chromeos/drive/file_system/copy_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/copy_operation.h
@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 namespace base {
diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc
index 5b88e13..51ff128 100644
--- a/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc
@@ -7,11 +7,11 @@
 #include "base/files/file_util.h"
 #include "base/task_runner_util.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "components/drive/drive_api_util.h"
+#include "components/drive/file_change.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/create_directory_operation.cc b/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc
index ca05681..06919b7 100644
--- a/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/create_directory_operation.cc
@@ -4,12 +4,12 @@
 
 #include "chrome/browser/chromeos/drive/file_system/create_directory_operation.h"
 
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_change.h"
 
 namespace drive {
 namespace file_system {
diff --git a/chrome/browser/chromeos/drive/file_system/create_directory_operation.h b/chrome/browser/chromeos/drive/file_system/create_directory_operation.h
index 4b3055b..b06b6c9 100644
--- a/chrome/browser/chromeos/drive/file_system/create_directory_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/create_directory_operation.h
@@ -11,7 +11,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 
 namespace base {
 class FilePath;
diff --git a/chrome/browser/chromeos/drive/file_system/create_file_operation.cc b/chrome/browser/chromeos/drive/file_system/create_file_operation.cc
index cc2450d..6dcbdef 100644
--- a/chrome/browser/chromeos/drive/file_system/create_file_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/create_file_operation.cc
@@ -7,11 +7,11 @@
 #include <string>
 
 #include "base/files/file_util.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_change.h"
 #include "net/base/mime_util.h"
 
 namespace drive {
diff --git a/chrome/browser/chromeos/drive/file_system/create_file_operation.h b/chrome/browser/chromeos/drive/file_system/create_file_operation.h
index 6c2b627..16b39f0 100644
--- a/chrome/browser/chromeos/drive/file_system/create_file_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/create_file_operation.h
@@ -9,7 +9,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 
 namespace base {
 class FilePath;
diff --git a/chrome/browser/chromeos/drive/file_system/create_file_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/create_file_operation_unittest.cc
index fb12665..af8ed46 100644
--- a/chrome/browser/chromeos/drive/file_system/create_file_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/create_file_operation_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/chromeos/drive/file_system/create_file_operation.h"
 
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
+#include "components/drive/file_change.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/chrome/browser/chromeos/drive/file_system/download_operation.cc
index b917f7b..a939575 100644
--- a/chrome/browser/chromeos/drive/file_system/download_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/download_operation.cc
@@ -10,13 +10,13 @@
 #include "base/logging.h"
 #include "base/task_runner_util.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_change.h"
+#include "components/drive/file_errors.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 namespace drive {
diff --git a/chrome/browser/chromeos/drive/file_system/download_operation.h b/chrome/browser/chromeos/drive/file_system/download_operation.h
index 2ad4018..e986f79 100644
--- a/chrome/browser/chromeos/drive/file_system/download_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/download_operation.h
@@ -8,9 +8,9 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/job_list.h"
+#include "components/drive/file_errors.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 namespace base {
diff --git a/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc
index ea59583..8a098a5 100644
--- a/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc
@@ -8,10 +8,10 @@
 #include "base/task_runner_util.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
+#include "components/drive/file_change.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/test_util.h"
diff --git a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation.h b/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation.h
index fc63db1..5af2a1d 100644
--- a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation.h
@@ -10,8 +10,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_errors.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
+#include "components/drive/file_errors.h"
 
 namespace base {
 class FilePath;
diff --git a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc
index 1fe43bd..043de5d 100644
--- a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc
@@ -9,12 +9,12 @@
 #include "base/files/file_util.h"
 #include "base/run_loop.h"
 #include "base/task_runner_util.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "chrome/browser/chromeos/drive/file_write_watcher.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_change.h"
+#include "components/drive/file_errors.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/test_util.h"
diff --git a/chrome/browser/chromeos/drive/file_system/move_operation.cc b/chrome/browser/chromeos/drive/file_system/move_operation.cc
index 5f2dd91..f2cc685 100644
--- a/chrome/browser/chromeos/drive/file_system/move_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/move_operation.cc
@@ -5,11 +5,11 @@
 #include "chrome/browser/chromeos/drive/file_system/move_operation.h"
 
 #include "base/sequenced_task_runner.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_change.h"
 
 namespace drive {
 namespace file_system {
diff --git a/chrome/browser/chromeos/drive/file_system/move_operation.h b/chrome/browser/chromeos/drive/file_system/move_operation.h
index 7b41933..63ca40f 100644
--- a/chrome/browser/chromeos/drive/file_system/move_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/move_operation.h
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 namespace base {
diff --git a/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc
index 7f4f543..a43e024 100644
--- a/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/chromeos/drive/file_system/move_operation.h"
 
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
+#include "components/drive/file_change.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/chrome/browser/chromeos/drive/file_system/open_file_operation.cc
index dde595c..a9096a9 100644
--- a/chrome/browser/chromeos/drive/file_system/open_file_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/open_file_operation.cc
@@ -12,12 +12,12 @@
 #include "base/task_runner_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
-#include "chrome/browser/chromeos/drive/file_errors.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/job_scheduler.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_errors.h"
 
 namespace drive {
 namespace file_system {
diff --git a/chrome/browser/chromeos/drive/file_system/open_file_operation.h b/chrome/browser/chromeos/drive/file_system/open_file_operation.h
index 02795b6..19c8af7 100644
--- a/chrome/browser/chromeos/drive/file_system/open_file_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/open_file_operation.h
@@ -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_errors.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
+#include "components/drive/file_errors.h"
 
 namespace base {
 class FilePath;
diff --git a/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc
index 1126984..df29a10 100644
--- a/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/open_file_operation_unittest.cc
@@ -11,10 +11,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/task_runner_util.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_change.h"
+#include "components/drive/file_errors.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.h b/chrome/browser/chromeos/drive/file_system/operation_delegate.h
index eaa11a9..96c768c 100644
--- a/chrome/browser/chromeos/drive/file_system/operation_delegate.h
+++ b/chrome/browser/chromeos/drive/file_system/operation_delegate.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPERATION_DELEGATE_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPERATION_DELEGATE_H_
 
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 
 namespace base {
 class FilePath;
diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.cc b/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
index 2597de0..d545267 100644
--- a/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
+++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
@@ -9,11 +9,11 @@
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "components/drive/event_logger.h"
+#include "components/drive/file_change.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "components/drive/service/test_util.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.h b/chrome/browser/chromeos/drive/file_system/operation_test_base.h
index 57eb401..50a95b1 100644
--- a/chrome/browser/chromeos/drive/file_system/operation_test_base.h
+++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.h
@@ -8,11 +8,11 @@
 #include <set>
 
 #include "base/files/scoped_temp_dir.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "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 "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation.cc b/chrome/browser/chromeos/drive/file_system/remove_operation.cc
index 584eaa5..67d2322 100644
--- a/chrome/browser/chromeos/drive/file_system/remove_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/remove_operation.cc
@@ -6,12 +6,12 @@
 
 #include "base/sequenced_task_runner.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_change.h"
 
 namespace drive {
 namespace file_system {
diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation.h b/chrome/browser/chromeos/drive/file_system/remove_operation.h
index c8cc6f3..a9b9e2d 100644
--- a/chrome/browser/chromeos/drive/file_system/remove_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/remove_operation.h
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 namespace base {
diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc
index 325afd9..d4220bd 100644
--- a/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
 
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
+#include "components/drive/file_change.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/search_operation.h b/chrome/browser/chromeos/drive/file_system/search_operation.h
index 709371d..6e896ec 100644
--- a/chrome/browser/chromeos/drive/file_system/search_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/search_operation.h
@@ -10,8 +10,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_errors.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
+#include "components/drive/file_errors.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 namespace base {
diff --git a/chrome/browser/chromeos/drive/file_system/set_property_operation.cc b/chrome/browser/chromeos/drive/file_system/set_property_operation.cc
index 48ebd75..d60a76f 100644
--- a/chrome/browser/chromeos/drive/file_system/set_property_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/set_property_operation.cc
@@ -7,11 +7,11 @@
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/sequenced_task_runner.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_errors.h"
 
 namespace drive {
 namespace file_system {
diff --git a/chrome/browser/chromeos/drive/file_system/set_property_operation.h b/chrome/browser/chromeos/drive/file_system/set_property_operation.h
index 6a93a16..ff006b8 100644
--- a/chrome/browser/chromeos/drive/file_system/set_property_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/set_property_operation.h
@@ -11,7 +11,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 #include "google_apis/drive/drive_api_requests.h"
 
 namespace base {
diff --git a/chrome/browser/chromeos/drive/file_system/set_property_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/set_property_operation_unittest.cc
index 396245b..402de23 100644
--- a/chrome/browser/chromeos/drive/file_system/set_property_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/set_property_operation_unittest.cc
@@ -5,9 +5,9 @@
 #include "chrome/browser/chromeos/drive/file_system/set_property_operation.h"
 
 #include "base/files/file_path.h"
-#include "chrome/browser/chromeos/drive/file_errors.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 "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/chrome/browser/chromeos/drive/file_system/touch_operation.cc
index 85fb210..fac0908 100644
--- a/chrome/browser/chromeos/drive/file_system/touch_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/touch_operation.cc
@@ -8,11 +8,11 @@
 #include "base/files/file_path.h"
 #include "base/sequenced_task_runner.h"
 #include "base/time/time.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
+#include "components/drive/file_change.h"
+#include "components/drive/file_errors.h"
 
 namespace drive {
 namespace file_system {
diff --git a/chrome/browser/chromeos/drive/file_system/touch_operation.h b/chrome/browser/chromeos/drive/file_system/touch_operation.h
index fe2ebc2..fcba888 100644
--- a/chrome/browser/chromeos/drive/file_system/touch_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/touch_operation.h
@@ -9,7 +9,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 
 namespace base {
 class FilePath;
diff --git a/chrome/browser/chromeos/drive/file_system/touch_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/touch_operation_unittest.cc
index 869eb5d..ba19118 100644
--- a/chrome/browser/chromeos/drive/file_system/touch_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/touch_operation_unittest.cc
@@ -6,10 +6,10 @@
 
 #include "base/files/file_path.h"
 #include "base/time/time.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_errors.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/chrome/browser/chromeos/drive/file_system/truncate_operation.cc
index f94fe52..80290ed 100644
--- a/chrome/browser/chromeos/drive/file_system/truncate_operation.cc
+++ b/chrome/browser/chromeos/drive/file_system/truncate_operation.cc
@@ -13,11 +13,11 @@
 #include "base/task_runner_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
-#include "chrome/browser/chromeos/drive/file_errors.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/job_scheduler.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_errors.h"
 
 namespace drive {
 namespace file_system {
diff --git a/chrome/browser/chromeos/drive/file_system/truncate_operation.h b/chrome/browser/chromeos/drive/file_system/truncate_operation.h
index 5067c6b..dcdd1b8 100644
--- a/chrome/browser/chromeos/drive/file_system/truncate_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/truncate_operation.h
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 
 namespace base {
 class FilePath;
diff --git a/chrome/browser/chromeos/drive/file_system_core_util.cc b/chrome/browser/chromeos/drive/file_system_core_util.cc
index a82b329..a63d44d 100644
--- a/chrome/browser/chromeos/drive/file_system_core_util.cc
+++ b/chrome/browser/chromeos/drive/file_system_core_util.cc
@@ -22,11 +22,11 @@
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/job_list.h"
 #include "chrome/browser/chromeos/drive/write_on_cache_file.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/drive_pref_names.h"
 #include "net/base/escape.h"
 
 namespace drive {
diff --git a/chrome/browser/chromeos/drive/file_system_core_util.h b/chrome/browser/chromeos/drive/file_system_core_util.h
index f222f6d..af73750 100644
--- a/chrome/browser/chromeos/drive/file_system_core_util.h
+++ b/chrome/browser/chromeos/drive/file_system_core_util.h
@@ -9,7 +9,7 @@
 
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 #include "url/gurl.h"
 
 namespace drive {
diff --git a/chrome/browser/chromeos/drive/file_system_metadata.h b/chrome/browser/chromeos/drive/file_system_metadata.h
index 4ca0c87..ae81c1d 100644
--- a/chrome/browser/chromeos/drive/file_system_metadata.h
+++ b/chrome/browser/chromeos/drive/file_system_metadata.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/time/time.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 
 namespace drive {
 
diff --git a/chrome/browser/chromeos/drive/file_system_observer.h b/chrome/browser/chromeos/drive/file_system_observer.h
index 8b95173..a4a0891 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_errors.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
+#include "components/drive/file_errors.h"
 
 namespace base {
 class FilePath;
diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc b/chrome/browser/chromeos/drive/file_system_unittest.cc
index e2fa228..d3ce2a2 100644
--- a/chrome/browser/chromeos/drive/file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system_unittest.cc
@@ -17,16 +17,16 @@
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/file_system_observer.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/sync_client.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_api_util.h"
+#include "components/drive/drive_test_util.h"
 #include "components/drive/event_logger.h"
+#include "components/drive/file_change.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "components/drive/service/test_util.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/chromeos/drive/file_system_util.cc b/chrome/browser/chromeos/drive/file_system_util.cc
index 406af7f..572b585 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/drive_pref_names.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/job_list.h"
@@ -37,6 +36,7 @@
 #include "chrome/common/chrome_paths_internal.h"
 #include "chromeos/chromeos_constants.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/drive_pref_names.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "storage/browser/fileapi/file_system_url.h"
diff --git a/chrome/browser/chromeos/drive/file_system_util.h b/chrome/browser/chromeos/drive/file_system_util.h
index ea9abd5..5e91b3c 100644
--- a/chrome/browser/chromeos/drive/file_system_util.h
+++ b/chrome/browser/chromeos/drive/file_system_util.h
@@ -9,7 +9,7 @@
 
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 #include "url/gurl.h"
 
 class Profile;
diff --git a/chrome/browser/chromeos/drive/file_task_executor.h b/chrome/browser/chromeos/drive/file_task_executor.h
index dd4cbba..45e41e6 100644
--- a/chrome/browser/chromeos/drive/file_task_executor.h
+++ b/chrome/browser/chromeos/drive/file_task_executor.h
@@ -10,8 +10,8 @@
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/file_manager/file_tasks.h"
+#include "components/drive/file_errors.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 namespace drive {
diff --git a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc
index ee90d2b..76c8b35 100644
--- a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc
+++ b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc
@@ -9,11 +9,11 @@
 #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_errors.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_errors.h"
 #include "content/public/browser/browser_thread.h"
 #include "storage/browser/fileapi/file_system_url.h"
 #include "storage/common/fileapi/directory_entry.h"
diff --git a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.h b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.h
index e6d6205..0cc835f 100644
--- a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.h
+++ b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.h
@@ -24,7 +24,7 @@
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 #include "storage/browser/blob/scoped_file.h"
 
 namespace base {
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 842200a..b6d349e 100644
--- a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc
+++ b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc
@@ -12,10 +12,10 @@
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/chromeos/drive/fake_file_system.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
+#include "components/drive/drive_test_util.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "components/drive/service/test_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
diff --git a/chrome/browser/chromeos/drive/job_list.h b/chrome/browser/chromeos/drive/job_list.h
index 82d5991..3f49a37 100644
--- a/chrome/browser/chromeos/drive/job_list.h
+++ b/chrome/browser/chromeos/drive/job_list.h
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 
 namespace drive {
 
diff --git a/chrome/browser/chromeos/drive/job_scheduler.cc b/chrome/browser/chromeos/drive/job_scheduler.cc
index cc62219..af03c76 100644
--- a/chrome/browser/chromeos/drive/job_scheduler.cc
+++ b/chrome/browser/chromeos/drive/job_scheduler.cc
@@ -13,7 +13,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
-#include "chrome/browser/chromeos/drive/drive_pref_names.h"
+#include "components/drive/drive_pref_names.h"
 #include "components/drive/event_logger.h"
 #include "google_apis/drive/drive_api_parser.h"
 
diff --git a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
index e3fb900..d9d056f 100644
--- a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
+++ b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
@@ -15,8 +15,8 @@
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
-#include "chrome/browser/chromeos/drive/drive_pref_names.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
+#include "components/drive/drive_pref_names.h"
+#include "components/drive/drive_test_util.h"
 #include "components/drive/event_logger.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "components/drive/service/test_util.h"
diff --git a/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc b/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc
index 580ddcc..2f628bc 100644
--- a/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc
+++ b/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc
@@ -10,12 +10,12 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/remove_stale_cache_files.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/drive_test_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/drive/resource_metadata.h b/chrome/browser/chromeos/drive/resource_metadata.h
index ffdcb1a..32b91b6 100644
--- a/chrome/browser/chromeos/drive/resource_metadata.h
+++ b/chrome/browser/chromeos/drive/resource_metadata.h
@@ -12,8 +12,8 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/resource_metadata_storage.h"
+#include "components/drive/file_errors.h"
 
 namespace base {
 class SequencedTaskRunner;
diff --git a/chrome/browser/chromeos/drive/resource_metadata_storage.h b/chrome/browser/chromeos/drive/resource_metadata_storage.h
index 7b717f3..931037c 100644
--- a/chrome/browser/chromeos/drive/resource_metadata_storage.h
+++ b/chrome/browser/chromeos/drive/resource_metadata_storage.h
@@ -12,8 +12,8 @@
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_errors.h"
 
 namespace base {
 class SequencedTaskRunner;
diff --git a/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc
index ebad576..e6b3860 100644
--- a/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc
+++ b/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc
@@ -11,8 +11,8 @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_split.h"
 #include "base/thread_task_runner_handle.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/drive_test_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
diff --git a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc
index 5a0f553..0858620 100644
--- a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc
@@ -12,11 +12,11 @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/drive_test_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/chromeos/drive/search_metadata_unittest.cc b/chrome/browser/chromeos/drive/search_metadata_unittest.cc
index 0dd707c..ef06bf9a 100644
--- a/chrome/browser/chromeos/drive/search_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/search_metadata_unittest.cc
@@ -11,11 +11,11 @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "components/drive/drive_api_util.h"
+#include "components/drive/drive_test_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc b/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc
index 23b458a..3e485a1 100644
--- a/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc
+++ b/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc
@@ -5,13 +5,13 @@
 #include "chrome/browser/chromeos/drive/sync/entry_revert_performer.h"
 
 #include "chrome/browser/chromeos/drive/change_list_processor.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_api_util.h"
+#include "components/drive/file_change.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 namespace drive {
diff --git a/chrome/browser/chromeos/drive/sync/entry_revert_performer.h b/chrome/browser/chromeos/drive/sync/entry_revert_performer.h
index 5a3dac8..f8ab07d 100644
--- a/chrome/browser/chromeos/drive/sync/entry_revert_performer.h
+++ b/chrome/browser/chromeos/drive/sync/entry_revert_performer.h
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 namespace base {
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 6bdcad7..c7a9ddc 100644
--- a/chrome/browser/chromeos/drive/sync/entry_revert_performer_unittest.cc
+++ b/chrome/browser/chromeos/drive/sync/entry_revert_performer_unittest.cc
@@ -5,11 +5,11 @@
 #include "chrome/browser/chromeos/drive/sync/entry_revert_performer.h"
 
 #include "base/task_runner_util.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
+#include "components/drive/file_change.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/test_util.h"
diff --git a/chrome/browser/chromeos/drive/sync/entry_update_performer.cc b/chrome/browser/chromeos/drive/sync/entry_update_performer.cc
index ad0e099..6362207 100644
--- a/chrome/browser/chromeos/drive/sync/entry_update_performer.cc
+++ b/chrome/browser/chromeos/drive/sync/entry_update_performer.cc
@@ -10,7 +10,6 @@
 #include "base/files/file_util.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
@@ -18,6 +17,7 @@
 #include "chrome/browser/chromeos/drive/sync/entry_revert_performer.h"
 #include "chrome/browser/chromeos/drive/sync/remove_performer.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_change.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 namespace drive {
diff --git a/chrome/browser/chromeos/drive/sync/entry_update_performer.h b/chrome/browser/chromeos/drive/sync/entry_update_performer.h
index 8c8deb6..2a3997a 100644
--- a/chrome/browser/chromeos/drive/sync/entry_update_performer.h
+++ b/chrome/browser/chromeos/drive/sync/entry_update_performer.h
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 namespace base {
diff --git a/chrome/browser/chromeos/drive/sync/remove_performer.h b/chrome/browser/chromeos/drive/sync/remove_performer.h
index d7213dc..87ff0be 100644
--- a/chrome/browser/chromeos/drive/sync/remove_performer.h
+++ b/chrome/browser/chromeos/drive/sync/remove_performer.h
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 namespace base {
diff --git a/chrome/browser/chromeos/drive/sync_client.h b/chrome/browser/chromeos/drive/sync_client.h
index d3c0593..5e9f4f0 100644
--- a/chrome/browser/chromeos/drive/sync_client.h
+++ b/chrome/browser/chromeos/drive/sync_client.h
@@ -14,9 +14,9 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
+#include "components/drive/file_errors.h"
 
 namespace base {
 class SequencedTaskRunner;
diff --git a/chrome/browser/chromeos/drive/sync_client_unittest.cc b/chrome/browser/chromeos/drive/sync_client_unittest.cc
index d66418f..5e92b96 100644
--- a/chrome/browser/chromeos/drive/sync_client_unittest.cc
+++ b/chrome/browser/chromeos/drive/sync_client_unittest.cc
@@ -14,10 +14,8 @@
 #include "base/test/test_timeouts.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/move_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
 #include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
@@ -26,7 +24,9 @@
 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/drive_test_util.h"
 #include "components/drive/event_logger.h"
+#include "components/drive/file_change.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/drive/drive_api_parser.h"
diff --git a/chrome/browser/chromeos/drive/write_on_cache_file.h b/chrome/browser/chromeos/drive/write_on_cache_file.h
index 9ac0996..e2e714b 100644
--- a/chrome/browser/chromeos/drive/write_on_cache_file.h
+++ b/chrome/browser/chromeos/drive/write_on_cache_file.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_DRIVE_WRITE_ON_CACHE_FILE_H_
 
 #include "base/callback_forward.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 
 namespace base {
 class FilePath;
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.cc b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
index 5c625b2..9d8bb48 100644
--- a/chrome/browser/chromeos/extensions/file_manager/event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
@@ -15,8 +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/drive_pref_names.h"
-#include "chrome/browser/chromeos/drive/file_change.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"
@@ -37,6 +35,8 @@
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state_handler.h"
+#include "components/drive/drive_pref_names.h"
+#include "components/drive/file_change.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/file_manager_private_apitest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc
index f3bc8d4..4eda6e9e 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc
@@ -4,7 +4,6 @@
 
 #include "base/run_loop.h"
 #include "base/stl_util.h"
-#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/extensions/file_manager/event_router.h"
 #include "chrome/browser/chromeos/file_manager/file_watcher.h"
 #include "chrome/browser/chromeos/file_manager/mount_test_util.h"
@@ -15,6 +14,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/disks/mock_disk_mount_manager.h"
+#include "components/drive/file_change.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/install_warning.h"
 #include "google_apis/drive/test_util.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 a914b40..754694c 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_errors.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"
 
 namespace drive {
 class FileCacheEntry;
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h
index 14185ec..c7dd789 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h
@@ -9,10 +9,10 @@
 
 #include <string>
 
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_base.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/browser/extensions/chrome_extension_function_details.h"
+#include "components/drive/file_errors.h"
 #include "device/media_transfer_protocol/mtp_storage_info.pb.h"
 #include "extensions/browser/extension_function.h"
 #include "storage/browser/fileapi/file_system_url.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
index 0d56a55..d42112d 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
@@ -13,7 +13,6 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/drive/drive_pref_names.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"
@@ -38,6 +37,7 @@
 #include "chrome/common/extensions/api/file_manager_private_internal.h"
 #include "chrome/common/extensions/api/manifest_types.h"
 #include "chrome/common/pref_names.h"
+#include "components/drive/drive_pref_names.h"
 #include "components/drive/event_logger.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.h b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.h
index a307d25..8913367 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.h
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.h
@@ -10,9 +10,9 @@
 #include <vector>
 
 #include "base/files/file_path.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_base.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_errors.h"
 
 namespace ui {
 struct SelectedFileInfo;
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 79bb4b5..9ec2bba 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_errors.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"
@@ -22,6 +21,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/file_manager_private.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/file_errors.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/fileapi_util_unittest.cc b/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc
index c4ce763..98cc4d3 100644
--- a/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc
+++ b/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc
@@ -3,13 +3,13 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/chromeos/drive/fake_file_system.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
 #include "chrome/browser/chromeos/file_manager/mount_test_util.cc"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
+#include "components/drive/drive_test_util.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "components/drive/service/test_util.h"
 #include "content/public/browser/storage_partition.h"
diff --git a/chrome/browser/chromeos/file_manager/filesystem_api_util.cc b/chrome/browser/chromeos/file_manager/filesystem_api_util.cc
index 0b5cfe5..a5e352f 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_errors.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
@@ -18,6 +17,7 @@
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "components/drive/file_errors.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/fileapi/DEPS b/chrome/browser/chromeos/fileapi/DEPS
index f335284..cdad3c2 100644
--- a/chrome/browser/chromeos/fileapi/DEPS
+++ b/chrome/browser/chromeos/fileapi/DEPS
@@ -1,5 +1,3 @@
-specific_include_rules = {
-  ".*_unittest\.cc": [
-    "+components/drive"
-  ],
-}
+include_rules = [
+  "+components/drive",
+]
diff --git a/chrome/browser/chromeos/fileapi/external_file_url_request_job.h b/chrome/browser/chromeos/fileapi/external_file_url_request_job.h
index 5616b21..a026e43 100644
--- a/chrome/browser/chromeos/fileapi/external_file_url_request_job.h
+++ b/chrome/browser/chromeos/fileapi/external_file_url_request_job.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/drive/file_errors.h"
+#include "components/drive/file_errors.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_byte_range.h"
 #include "net/url_request/url_request_job.h"
diff --git a/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc b/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc
index 9c161ce..5f5d206 100644
--- a/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc
+++ b/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc
@@ -12,7 +12,6 @@
 #include "base/threading/thread.h"
 #include "chrome/browser/chromeos/drive/drive_file_stream_reader.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/chromeos/drive/fake_file_system.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/prefs/browser_prefs.h"
@@ -21,6 +20,7 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
+#include "components/drive/drive_test_util.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "components/drive/service/test_util.h"
 #include "components/pref_registry/pref_registry_syncable.h"
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 9e9c7f8..9be6ff3 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -21,7 +21,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
-#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/chromeos/drive/file_system_core_util.h"
 #include "chrome/browser/chromeos/input_method/input_method_syncer.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
@@ -34,6 +33,7 @@
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/system/statistics_provider.h"
 #include "chromeos/timezone/timezone_resolver.h"
+#include "components/drive/drive_pref_names.h"
 #include "components/feedback/tracing_manager.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/user_manager/user.h"
diff --git a/chrome/browser/download/DEPS b/chrome/browser/download/DEPS
new file mode 100644
index 0000000..55e3579
--- /dev/null
+++ b/chrome/browser/download/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+components/drive/drive_pref_names.h",
+]
diff --git a/chrome/browser/download/download_dir_policy_handler.cc b/chrome/browser/download/download_dir_policy_handler.cc
index d15b71a..cea2ba2 100644
--- a/chrome/browser/download/download_dir_policy_handler.cc
+++ b/chrome/browser/download/download_dir_policy_handler.cc
@@ -8,10 +8,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/policy/policy_path_parser.h"
 #include "chrome/common/pref_names.h"
+#include "components/drive/drive_pref_names.h"
 #include "components/policy/core/browser/configuration_policy_handler_parameters.h"
 #include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
diff --git a/chrome/browser/download/download_dir_policy_handler_unittest.cc b/chrome/browser/download/download_dir_policy_handler_unittest.cc
index 49db12c..b451067 100644
--- a/chrome/browser/download/download_dir_policy_handler_unittest.cc
+++ b/chrome/browser/download/download_dir_policy_handler_unittest.cc
@@ -7,10 +7,10 @@
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/download/download_dir_policy_handler.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/common/pref_names.h"
+#include "components/drive/drive_pref_names.h"
 #include "components/policy/core/browser/configuration_policy_handler_parameters.h"
 #include "components/policy/core/browser/configuration_policy_pref_store.h"
 #include "components/policy/core/browser/configuration_policy_pref_store_test.h"
diff --git a/chrome/browser/policy/DEPS b/chrome/browser/policy/DEPS
index c7fab80..468cb59 100644
--- a/chrome/browser/policy/DEPS
+++ b/chrome/browser/policy/DEPS
@@ -1,6 +1,7 @@
 include_rules = [
   "+chrome",
   "+chromeos",
+  "+components/drive/drive_pref_names.h",
   "+components/user_manager",
   "+content/public/browser",
   "+content/public/common",
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
index 78108cb..784dc2d 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -43,11 +43,11 @@
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/chromeos/platform_keys/key_permissions_policy_handler.h"
 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h"
 #include "chromeos/chromeos_pref_names.h"
 #include "chromeos/dbus/power_policy_controller.h"
+#include "components/drive/drive_pref_names.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "ui/chromeos/accessibility_types.h"
diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
index e796aab..a23b4ba 100644
--- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
@@ -16,7 +16,6 @@
 #include "base/sys_info.h"
 #include "chrome/browser/chromeos/drive/debug_info_collector.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
-#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/job_list.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
@@ -27,6 +26,7 @@
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_api_util.h"
 #include "components/drive/drive_notification_manager.h"
+#include "components/drive/drive_pref_names.h"
 #include "components/drive/event_logger.h"
 #include "components/drive/service/drive_service_interface.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index eb756dc..2fc7cc6 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -110,14 +110,8 @@
         'browser/chromeos/drive/drive_file_stream_reader.h',
         'browser/chromeos/drive/drive_integration_service.cc',
         'browser/chromeos/drive/drive_integration_service.h',
-        'browser/chromeos/drive/drive_pref_names.cc',
-        'browser/chromeos/drive/drive_pref_names.h',
         'browser/chromeos/drive/file_cache.cc',
         'browser/chromeos/drive/file_cache.h',
-        'browser/chromeos/drive/file_change.cc',
-        'browser/chromeos/drive/file_change.h',
-        'browser/chromeos/drive/file_errors.cc',
-        'browser/chromeos/drive/file_errors.h',
         'browser/chromeos/drive/file_system.cc',
         'browser/chromeos/drive/file_system.h',
         'browser/chromeos/drive/file_system/copy_operation.cc',
@@ -175,8 +169,6 @@
         'browser/chromeos/drive/job_queue.h',
         'browser/chromeos/drive/job_scheduler.cc',
         'browser/chromeos/drive/job_scheduler.h',
-        'browser/chromeos/drive/local_file_reader.cc',
-        'browser/chromeos/drive/local_file_reader.h',
         'browser/chromeos/drive/remove_stale_cache_files.cc',
         'browser/chromeos/drive/remove_stale_cache_files.h',
         'browser/chromeos/drive/resource_entry_conversion.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 481c3c7..2ed9098 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -530,8 +530,8 @@
       'browser/ui/webui/bidi_checker_web_ui_test.cc',
       'browser/ui/webui/bidi_checker_web_ui_test.h',
       'browser/ui/webui/bookmarks_ui_browsertest.cc',
-      'browser/ui/webui/chromeos/bluetooth_pairing_ui_browsertest-inl.h',
       'browser/ui/webui/chrome_url_data_manager_browsertest.cc',
+      'browser/ui/webui/chromeos/bluetooth_pairing_ui_browsertest-inl.h',
       'browser/ui/webui/constrained_web_dialog_ui_browsertest.cc',
       'browser/ui/webui/downloads_dom_handler_browsertest.cc',
       'browser/ui/webui/downloads_ui_browsertest.cc',
@@ -661,8 +661,6 @@
       'browser/chromeos/device/input_service_proxy_browsertest.cc',
       'browser/chromeos/drive/drive_integration_service_browsertest.cc',
       'browser/chromeos/drive/drive_notification_manager_factory_browsertest.cc',
-      'browser/chromeos/drive/drive_test_util.cc',
-      'browser/chromeos/drive/drive_test_util.h',
       'browser/chromeos/extensions/accessibility_features_apitest.cc',
       'browser/chromeos/extensions/echo_private_apitest.cc',
       'browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc',
@@ -677,22 +675,22 @@
       'browser/chromeos/extensions/wallpaper_manager_browsertest.cc',
       'browser/chromeos/extensions/wallpaper_private_apitest.cc',
       'browser/chromeos/file_manager/audio_player_browsertest.cc',
-      'browser/chromeos/file_manager/gallery_browsertest.cc',
       'browser/chromeos/file_manager/external_filesystem_apitest.cc',
+      'browser/chromeos/file_manager/file_manager_browsertest.cc',
       'browser/chromeos/file_manager/file_manager_browsertest_base.cc',
       'browser/chromeos/file_manager/file_manager_browsertest_base.h',
-      'browser/chromeos/file_manager/file_manager_browsertest.cc',
       'browser/chromeos/file_manager/file_manager_jstest.cc',
       'browser/chromeos/file_manager/file_manager_jstest_base.cc',
       'browser/chromeos/file_manager/file_manager_jstest_base.h',
+      'browser/chromeos/file_manager/gallery_browsertest.cc',
+      'browser/chromeos/file_manager/gallery_jstest.cc',
+      'browser/chromeos/file_manager/image_loader_jstest.cc',
       'browser/chromeos/file_manager/mount_test_util.cc',
       'browser/chromeos/file_manager/mount_test_util.h',
       'browser/chromeos/file_manager/video_player_browsertest.cc',
-      'browser/chromeos/file_manager/gallery_jstest.cc',
-      'browser/chromeos/file_manager/image_loader_jstest.cc',
       'browser/chromeos/file_manager/zip_file_creator_browsertest.cc',
-      'browser/chromeos/first_run/drive_first_run_browsertest.cc',
       'browser/chromeos/first_run/chromeos_first_run_browsertest.cc',
+      'browser/chromeos/first_run/drive_first_run_browsertest.cc',
       'browser/chromeos/input_method/input_method_engine_browsertests.cc',
       'browser/chromeos/input_method/mode_indicator_browsertest.cc',
       'browser/chromeos/login/crash_restore_browsertest.cc',
@@ -2265,6 +2263,7 @@
           'dependencies': [
             '../dbus/dbus.gyp:dbus_test_support',
             '../build/linux/system.gyp:dbus',
+            '../components/components.gyp:drive_test_support',
             '../ui/login/login.gyp:login_resources',
           ],
         }, {  # Non-ChromeOS
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index e296d4b..a816def 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1130,6 +1130,9 @@
       'renderer/resources/extensions/notifications_custom_bindings.gtestjs',
     ],
     'chrome_unit_tests_chromeos_sources': [
+      # TODO(lukasza): Move Drive tests outside of CrOS (crbug.com/498951).
+      '../components/drive/file_change_unittest.cc',
+      '../components/drive/local_file_reader_unittest.cc',
       'browser/chromeos/accessibility/magnification_manager_unittest.cc',
       'browser/chromeos/accessibility/spoken_feedback_event_rewriter_unittest.cc',
       'browser/chromeos/attestation/attestation_ca_client_unittest.cc',
@@ -1145,8 +1148,6 @@
       'browser/chromeos/drive/download_handler_unittest.cc',
       'browser/chromeos/drive/drive_file_stream_reader_unittest.cc',
       'browser/chromeos/drive/drive_integration_service_unittest.cc',
-      'browser/chromeos/drive/drive_test_util.cc',
-      'browser/chromeos/drive/drive_test_util.h',
       'browser/chromeos/drive/dummy_file_system.cc',
       'browser/chromeos/drive/dummy_file_system.h',
       'browser/chromeos/drive/fake_file_system.cc',
@@ -1155,7 +1156,6 @@
       'browser/chromeos/drive/fake_free_disk_space_getter.cc',
       'browser/chromeos/drive/fake_free_disk_space_getter.h',
       'browser/chromeos/drive/file_cache_unittest.cc',
-      'browser/chromeos/drive/file_change_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',
@@ -1179,7 +1179,6 @@
       'browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc',
       'browser/chromeos/drive/job_queue_unittest.cc',
       'browser/chromeos/drive/job_scheduler_unittest.cc',
-      'browser/chromeos/drive/local_file_reader_unittest.cc',
       'browser/chromeos/drive/remove_stale_cache_files_unittest.cc',
       'browser/chromeos/drive/resource_entry_conversion_unittest.cc',
       'browser/chromeos/drive/resource_metadata_storage_unittest.cc',
@@ -2455,6 +2454,7 @@
           ],
           'dependencies': [
             '../ash/ash_resources.gyp:ash_resources',
+            '../components/components.gyp:drive_test_support',
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
           ],
           'sources!': [
diff --git a/components/drive.gypi b/components/drive.gypi
index 730636c..b9dfd49 100644
--- a/components/drive.gypi
+++ b/components/drive.gypi
@@ -38,10 +38,18 @@
         'drive/drive_notification_manager.cc',
         'drive/drive_notification_manager.h',
         'drive/drive_notification_observer.h',
+        'drive/drive_pref_names.cc',
+        'drive/drive_pref_names.h',
         'drive/drive_uploader.cc',
         'drive/drive_uploader.h',
         'drive/event_logger.cc',
         'drive/event_logger.h',
+        'drive/file_change.cc',
+        'drive/file_change.h',
+        'drive/file_errors.cc',
+        'drive/file_errors.h',
+        'drive/local_file_reader.cc',
+        'drive/local_file_reader.h',
         'drive/service/drive_api_service.cc',
         'drive/service/drive_api_service.h',
         'drive/service/drive_service_interface.cc',
@@ -71,7 +79,9 @@
       ],
       'dependencies': [
         'drive',
+        'drive_proto',
         '../base/base.gyp:base',
+        '../content/content_shell_and_tests.gyp:test_support_content',
         '../google_apis/google_apis.gyp:google_apis',
         '../net/net.gyp:net',
       ],
@@ -82,16 +92,12 @@
         "drive/service/fake_drive_service.h",
         "drive/service/test_util.cc",
         "drive/service/test_util.h",
+        "drive/drive_test_util.cc",
+        "drive/drive_test_util.h",
       ],
     },
 
     # TODO(lukasza): drive_unittests target.
     # Currently tests are built as part of chrome/chrome_tests_unit.gypi.
-    # Drive files that probably should be moved out of chrome_tests_unit.gypi:
-    #   components/drive/service/drive_api_util_unittest.cc
-    #   components/drive/service/drive_app_registry_unittest.cc
-    #   components/drive/service/drive_uploader_unittest.cc
-    #   components/drive/service/event_logger_unittest.cc
-    #   components/drive/service/fake_drive_service_unittest.cc
   ],
 }
diff --git a/components/drive/BUILD.gn b/components/drive/BUILD.gn
index f3f91c4..f911702 100644
--- a/components/drive/BUILD.gn
+++ b/components/drive/BUILD.gn
@@ -14,10 +14,18 @@ source_set("drive") {
     "drive_notification_manager.cc",
     "drive_notification_manager.h",
     "drive_notification_observer.h",
+    "drive_pref_names.cc",
+    "drive_pref_names.h",
     "drive_uploader.cc",
     "drive_uploader.h",
     "event_logger.cc",
     "event_logger.h",
+    "file_change.cc",
+    "file_change.h",
+    "file_errors.cc",
+    "file_errors.h",
+    "local_file_reader.cc",
+    "local_file_reader.h",
     "service/drive_api_service.cc",
     "service/drive_api_service.h",
     "service/drive_service_interface.cc",
@@ -44,7 +52,6 @@ source_set("drive") {
 }
 
 proto_library("proto") {
-  visibility = [ ":drive" ]
   sources = [
     "drive.proto",
   ]
@@ -53,6 +60,8 @@ proto_library("proto") {
 source_set("test_support") {
   testonly = true
   sources = [
+    "drive_test_util.cc",
+    "drive_test_util.h",
     "service/dummy_drive_service.cc",
     "service/dummy_drive_service.h",
     "service/fake_drive_service.cc",
@@ -62,7 +71,9 @@ source_set("test_support") {
   ]
   deps = [
     ":drive",
+    ":proto",
     "//base:base",
+    "//content/test:test_support",
     "//google_apis:google_apis",
     "//net:net",
   ]
diff --git a/components/drive/DEPS b/components/drive/DEPS
index 818ed7c..daa4a15 100644
--- a/components/drive/DEPS
+++ b/components/drive/DEPS
@@ -21,4 +21,17 @@ specific_include_rules = {
   "drive_uploader\.cc": [
     "+content/public/browser/power_save_blocker.h",
   ],
+
+  # The following test dependencies should be removed to fully componentize this
+  # directory. crbug.com/498951
+  r"(drive_test_util\.h"
+  r")": [
+    "+content/public/test/test_utils.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.
+  "drive_test_util\.h": [
+    "+third_party/cros_system_api/constants/cryptohome.h",
+  ],
 }
diff --git a/chrome/browser/chromeos/drive/drive_pref_names.cc b/components/drive/drive_pref_names.cc
index 7ec379f..352e6cf 100644
--- a/chrome/browser/chromeos/drive/drive_pref_names.cc
+++ b/components/drive/drive_pref_names.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/drive_pref_names.h"
+#include "components/drive/drive_pref_names.h"
 
 namespace drive {
 namespace prefs {
diff --git a/chrome/browser/chromeos/drive/drive_pref_names.h b/components/drive/drive_pref_names.h
index 9eec417..f2ba0e4 100644
--- a/chrome/browser/chromeos/drive/drive_pref_names.h
+++ b/components/drive/drive_pref_names.h
@@ -4,8 +4,8 @@
 
 // Constants for the names of preferences related to Google Drive.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_PREF_NAMES_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_PREF_NAMES_H_
+#ifndef COMPONENTS_DRIVE_DRIVE_PREF_NAMES_H_
+#define COMPONENTS_DRIVE_DRIVE_PREF_NAMES_H_
 
 namespace drive {
 namespace prefs {
@@ -17,4 +17,4 @@ extern const char kDisableDriveHostedFiles[];
 }  // namespace prefs
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_PREF_NAMES_H_
+#endif  // COMPONENTS_DRIVE_DRIVE_PREF_NAMES_H_
diff --git a/chrome/browser/chromeos/drive/drive_test_util.cc b/components/drive/drive_test_util.cc
index 350413610..48bece2 100644
--- a/chrome/browser/chromeos/drive/drive_test_util.cc
+++ b/components/drive/drive_test_util.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/drive_test_util.h"
+#include "components/drive/drive_test_util.h"
 
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
-#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "components/drive/drive.pb.h"
+#include "components/drive/drive_pref_names.h"
 
 namespace drive {
 namespace test_util {
diff --git a/chrome/browser/chromeos/drive/drive_test_util.h b/components/drive/drive_test_util.h
index e7904cb..41b5acb 100644
--- a/chrome/browser/chromeos/drive/drive_test_util.h
+++ b/components/drive/drive_test_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_TEST_UTIL_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_TEST_UTIL_H_
+#ifndef COMPONENTS_DRIVE_DRIVE_TEST_UTIL_H_
+#define COMPONENTS_DRIVE_DRIVE_TEST_UTIL_H_
 
 #include <string>
 
@@ -13,7 +13,9 @@
 #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;
 
@@ -26,7 +28,11 @@ 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
 
 // Helper to destroy objects which needs Destroy() to be called on destruction.
 // Note: When using this helper, you should destruct objects before
@@ -81,4 +87,4 @@ class FakeNetworkChangeNotifier : public net::NetworkChangeNotifier {
 }  // namespace test_util
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_TEST_UTIL_H_
+#endif  // COMPONENTS_DRIVE_DRIVE_TEST_UTIL_H_
diff --git a/chrome/browser/chromeos/drive/file_change.cc b/components/drive/file_change.cc
index 81d5985..0bdd7bc 100644
--- a/chrome/browser/chromeos/drive/file_change.cc
+++ b/components/drive/file_change.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_change.h"
+#include "components/drive/file_change.h"
 
 #include <sstream>
 
diff --git a/chrome/browser/chromeos/drive/file_change.h b/components/drive/file_change.h
index a8c29ff..40e3a6a 100644
--- a/chrome/browser/chromeos/drive/file_change.h
+++ b/components/drive/file_change.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_CHANGE_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_CHANGE_H_
+#ifndef COMPONENTS_DRIVE_FILE_CHANGE_H_
+#define COMPONENTS_DRIVE_FILE_CHANGE_H_
 
 #include <deque>
 #include <map>
@@ -11,7 +11,6 @@
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
-#include "storage/browser/fileapi/file_system_url.h"
 
 namespace drive {
 class ResourceEntry;
@@ -115,4 +114,4 @@ class FileChange {
 
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_CHANGE_H_
+#endif  // COMPONENTS_DRIVE_FILE_CHANGE_H_
diff --git a/chrome/browser/chromeos/drive/file_change_unittest.cc b/components/drive/file_change_unittest.cc
index 198ff1d..de8e3fe 100644
--- a/chrome/browser/chromeos/drive/file_change_unittest.cc
+++ b/components/drive/file_change_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_change.h"
+#include "components/drive/file_change.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/chromeos/drive/file_errors.cc b/components/drive/file_errors.cc
index 1fb57c9..2c49448 100644
--- a/chrome/browser/chromeos/drive/file_errors.cc
+++ b/components/drive/file_errors.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_errors.h"
+#include "components/drive/file_errors.h"
 
 #include "base/logging.h"
 
diff --git a/chrome/browser/chromeos/drive/file_errors.h b/components/drive/file_errors.h
index 4fb5f60..242a247 100644
--- a/chrome/browser/chromeos/drive/file_errors.h
+++ b/components/drive/file_errors.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_ERRORS_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_ERRORS_H_
+#ifndef COMPONENTS_DRIVE_FILE_ERRORS_H_
+#define COMPONENTS_DRIVE_FILE_ERRORS_H_
 
 #include "base/callback_forward.h"
 #include "base/files/file.h"
@@ -47,4 +47,4 @@ FileError GDataToFileError(google_apis::DriveApiErrorCode status);
 
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_ERRORS_H_
+#endif  // COMPONENTS_DRIVE_FILE_ERRORS_H_
diff --git a/chrome/browser/chromeos/drive/local_file_reader.cc b/components/drive/local_file_reader.cc
index ca2dfa2..e96b241 100644
--- a/chrome/browser/chromeos/drive/local_file_reader.cc
+++ b/components/drive/local_file_reader.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/local_file_reader.h"
+#include "components/drive/local_file_reader.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
diff --git a/chrome/browser/chromeos/drive/local_file_reader.h b/components/drive/local_file_reader.h
index 0b824da..ece3280 100644
--- a/chrome/browser/chromeos/drive/local_file_reader.h
+++ b/components/drive/local_file_reader.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_LOCAL_FILE_READER_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_LOCAL_FILE_READER_H_
+#ifndef COMPONENTS_DRIVE_LOCAL_FILE_READER_H_
+#define COMPONENTS_DRIVE_LOCAL_FILE_READER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ -67,4 +67,4 @@ class LocalFileReader {
 }  // namespace util
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_LOCAL_FILE_READER_H_
+#endif  // COMPONENTS_DRIVE_LOCAL_FILE_READER_H_
diff --git a/chrome/browser/chromeos/drive/local_file_reader_unittest.cc b/components/drive/local_file_reader_unittest.cc
index 8a429e1..e7790e7 100644
--- a/chrome/browser/chromeos/drive/local_file_reader_unittest.cc
+++ b/components/drive/local_file_reader_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/local_file_reader.h"
+#include "components/drive/local_file_reader.h"
 
 #include <string>
 
@@ -13,7 +13,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/threading/thread.h"
-#include "chrome/browser/chromeos/drive/drive_test_util.h"
+#include "components/drive/drive_test_util.h"
 #include "google_apis/drive/test_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/test_completion_callback.h"
author	lukasza <lukasza@chromium.org>	2015-08-07 17:36:39 -0700
committer	Commit bot <commit-bot@chromium.org>	2015-08-08 00:37:12 +0000
commit	76b4a982964ffefeffa73af775f92d4c22d48791 (patch)
tree	6c832c9985a8f3e6d70528027cfdf5dc0320c4f7
parent	7a45b182edf6fc0e2e61e87b2a75653c88364184 (diff)
download	chromium_src-76b4a982964ffefeffa73af775f92d4c22d48791.zip chromium_src-76b4a982964ffefeffa73af775f92d4c22d48791.tar.gz chromium_src-76b4a982964ffefeffa73af775f92d4c22d48791.tar.bz2