127 files changed, 608 insertions, 520 deletions
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index dad6c5b..ed83a7d 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -454,6 +454,9 @@ source_set("browser") {
                            ".",
                            "//chrome")
   }
+  if (is_chromeos) {
+    deps += [ "//components/drive:drive_chromeos" ]
+  }
   if (enable_background) {
     sources += rebase_path(gypi_values.chrome_browser_background_sources,
                            ".",
@@ -1282,6 +1285,10 @@ source_set("test_support") {
     ]
   }
 
+  if (is_chromeos) {
+    deps += [ "//components/drive:test_support_chromeos" ]
+  }
+
   if (enable_mdns) {
     sources += [
       "local_discovery/test_service_discovery_client.cc",
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index d8a1c57..d1adf5b 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -164,10 +164,18 @@ source_set("chromeos") {
 source_set("unit_tests") {
   testonly = true
 
+  # TODO(yawano): Move chrome_unit_tests_drive_sources to non chromeos build.
   sources = rebase_path(
-          chrome_tests_unit_gypi_values.chrome_unit_tests_chromeos_sources,
-          ".",
-          "//chrome")
+                chrome_tests_unit_gypi_values.chrome_unit_tests_chromeos_sources,
+                ".",
+                "//chrome") +
+            rebase_path(
+                chrome_tests_unit_gypi_values.chrome_unit_tests_drive_sources,
+                ".",
+                "//chrome") + rebase_path(
+                chrome_tests_unit_gypi_values.chrome_unit_tests_drive_chromeos_sources,
+                ".",
+                "//chrome")
 
   public_deps = [
     ":chromeos",
diff --git a/chrome/browser/chromeos/drive/debug_info_collector.h b/chrome/browser/chromeos/drive/debug_info_collector.h
index be6a919..0a0fdad 100644
--- a/chrome/browser/chromeos/drive/debug_info_collector.h
+++ b/chrome/browser/chromeos/drive/debug_info_collector.h
@@ -8,7 +8,7 @@
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
-#include "components/drive/file_system_interface.h"
+#include "components/drive/chromeos/file_system_interface.h"
 
 namespace drive {
 
diff --git a/chrome/browser/chromeos/drive/download_handler.cc b/chrome/browser/chromeos/drive/download_handler.cc
index 551e4af..756bb24 100644
--- a/chrome/browser/chromeos/drive/download_handler.cc
+++ b/chrome/browser/chromeos/drive/download_handler.cc
@@ -19,8 +19,8 @@
 #include "chrome/browser/download/download_history.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/file_system_interface.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/chromeos/drive/download_handler_unittest.cc b/chrome/browser/chromeos/drive/download_handler_unittest.cc
index 24fc82b..3a5bffe 100644
--- a/chrome/browser/chromeos/drive/download_handler_unittest.cc
+++ b/chrome/browser/chromeos/drive/download_handler_unittest.cc
@@ -10,7 +10,7 @@
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/drive/dummy_file_system.h"
+#include "components/drive/chromeos/dummy_file_system.h"
 #include "components/drive/file_system_core_util.h"
 #include "content/public/test/mock_download_item.h"
 #include "content/public/test/mock_download_manager.h"
diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc
index e1be50b..8b3decc 100644
--- a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc
+++ b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc
@@ -12,8 +12,8 @@
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/sequenced_task_runner.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/file_system_interface.h"
 #include "components/drive/local_file_reader.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/drive/task_util.h"
diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc
index 36751a0..2308ad1 100644
--- a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc
@@ -14,8 +14,8 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
-#include "components/drive/drive_test_util.h"
-#include "components/drive/fake_file_system.h"
+#include "components/drive/chromeos/drive_test_util.h"
+#include "components/drive/chromeos/fake_file_system.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/local_file_reader.h"
 #include "components/drive/service/fake_drive_service.h"
diff --git a/chrome/browser/chromeos/drive/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc
index ac1aff0..a54b606 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service.cc
+++ b/chrome/browser/chromeos/drive/drive_integration_service.cc
@@ -28,15 +28,15 @@
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/file_system.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive_api_util.h"
 #include "components/drive/drive_app_registry.h"
 #include "components/drive/drive_notification_manager.h"
 #include "components/drive/drive_pref_names.h"
 #include "components/drive/event_logger.h"
-#include "components/drive/file_cache.h"
-#include "components/drive/file_system.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.h"
 #include "components/drive/resource_metadata_storage.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_unittest.cc b/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc
index 2ffc5b3..f78f5d0 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc
@@ -7,7 +7,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/dummy_file_system.h"
+#include "components/drive/chromeos/dummy_file_system.h"
 #include "components/drive/service/dummy_drive_service.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
diff --git a/chrome/browser/chromeos/drive/file_system_util.cc b/chrome/browser/chromeos/drive/file_system_util.cc
index 9c47a8ba..4039dcb 100644
--- a/chrome/browser/chromeos/drive/file_system_util.cc
+++ b/chrome/browser/chromeos/drive/file_system_util.cc
@@ -34,10 +34,10 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chromeos/chromeos_constants.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_pref_names.h"
 #include "components/drive/file_system_core_util.h"
-#include "components/drive/file_system_interface.h"
 #include "components/drive/job_list.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/chromeos/drive/file_task_executor.cc b/chrome/browser/chromeos/drive/file_task_executor.cc
index d9a813f..c6bcd7d 100644
--- a/chrome/browser/chromeos/drive/file_task_executor.cc
+++ b/chrome/browser/chromeos/drive/file_task_executor.cc
@@ -18,8 +18,8 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/common/extensions/api/file_manager_private.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/file_system_interface.h"
 #include "components/drive/service/drive_service_interface.h"
 #include "content/public/browser/browser_thread.h"
 #include "storage/browser/fileapi/file_system_url.h"
diff --git a/chrome/browser/chromeos/drive/file_task_executor_unittest.cc b/chrome/browser/chromeos/drive/file_task_executor_unittest.cc
index 8d4201d..5731803 100644
--- a/chrome/browser/chromeos/drive/file_task_executor_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_task_executor_unittest.cc
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/run_loop.h"
-#include "components/drive/fake_file_system.h"
+#include "components/drive/chromeos/fake_file_system.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/fileapi/file_system_backend_delegate.cc b/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc
index 22fb9bc..99d1ab4 100644
--- a/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc
+++ b/chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc
@@ -12,8 +12,8 @@
 #include "chrome/browser/chromeos/drive/fileapi/fileapi_worker.h"
 #include "chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h"
 #include "chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/drive_api_util.h"
-#include "components/drive/file_system_interface.h"
 #include "content/public/browser/browser_thread.h"
 #include "storage/browser/fileapi/async_file_util.h"
 #include "storage/browser/fileapi/file_stream_reader.h"
diff --git a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc
index c2ae8c6..e5eebf7 100644
--- a/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc
+++ b/chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc
@@ -13,9 +13,9 @@
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system_interface.h"
 #include "components/drive/resource_entry_conversion.h"
 #include "content/public/browser/browser_thread.h"
 #include "storage/browser/fileapi/file_system_url.h"
diff --git a/chrome/browser/chromeos/drive/fileapi/fileapi_worker_unittest.cc b/chrome/browser/chromeos/drive/fileapi/fileapi_worker_unittest.cc
index 1d81c03..8acf3d6 100644
--- a/chrome/browser/chromeos/drive/fileapi/fileapi_worker_unittest.cc
+++ b/chrome/browser/chromeos/drive/fileapi/fileapi_worker_unittest.cc
@@ -10,7 +10,7 @@
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "components/drive/dummy_file_system.h"
+#include "components/drive/chromeos/dummy_file_system.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/test_util.h"
diff --git a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc
index eda88b4..d7b48a6 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
@@ -15,10 +15,10 @@
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
-#include "components/drive/drive_test_util.h"
-#include "components/drive/fake_file_system.h"
+#include "components/drive/chromeos/drive_test_util.h"
+#include "components/drive/chromeos/fake_file_system.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/file_system_core_util.h"
-#include "components/drive/file_system_interface.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "components/drive/service/test_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
diff --git a/chrome/browser/chromeos/drive/write_on_cache_file.cc b/chrome/browser/chromeos/drive/write_on_cache_file.cc
index 9b4b3b1..c6b0b2c 100644
--- a/chrome/browser/chromeos/drive/write_on_cache_file.cc
+++ b/chrome/browser/chromeos/drive/write_on_cache_file.cc
@@ -7,8 +7,8 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/threading/sequenced_worker_pool.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/file_system_core_util.h"
-#include "components/drive/file_system_interface.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/chromeos/drive/write_on_cache_file_unittest.cc b/chrome/browser/chromeos/drive/write_on_cache_file_unittest.cc
index 1bca4fc..64ae849 100644
--- a/chrome/browser/chromeos/drive/write_on_cache_file_unittest.cc
+++ b/chrome/browser/chromeos/drive/write_on_cache_file_unittest.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/chromeos/drive/write_on_cache_file.h"
 
 #include "base/bind.h"
-#include "components/drive/dummy_file_system.h"
+#include "components/drive/chromeos/dummy_file_system.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/test_util.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.cc b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
index 49fd5b6..37b22cf 100644
--- a/chrome/browser/chromeos/extensions/file_manager/event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
@@ -38,9 +38,9 @@
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state_handler.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/drive_pref_names.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system_interface.h"
 #include "components/drive/service/drive_service_interface.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.h b/chrome/browser/chromeos/extensions/file_manager/event_router.h
index ed30696..d3955a6 100644
--- a/chrome/browser/chromeos/extensions/file_manager/event_router.h
+++ b/chrome/browser/chromeos/extensions/file_manager/event_router.h
@@ -26,9 +26,9 @@
 #include "chromeos/disks/disk_mount_manager.h"
 #include "chromeos/network/network_state_handler_observer.h"
 #include "chromeos/settings/timezone_settings.h"
-#include "components/drive/file_system_observer.h"
+#include "components/drive/chromeos/file_system_observer.h"
+#include "components/drive/chromeos/sync_client.h"
 #include "components/drive/service/drive_service_interface.h"
-#include "components/drive/sync_client.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "storage/browser/fileapi/file_system_operation.h"
 
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h
index fb1c1c1..0f77f79 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h
@@ -16,8 +16,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_base.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system_interface.h"
 
 namespace drive {
 class FileCacheEntry;
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
index 2587322..6833258 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
@@ -32,9 +32,9 @@
 #include "chrome/common/extensions/api/file_manager_private.h"
 #include "chrome/common/extensions/api/file_manager_private_internal.h"
 #include "chromeos/disks/disk_mount_manager.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/event_logger.h"
-#include "components/drive/file_system_interface.h"
 #include "components/storage_monitor/storage_info.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "content/public/browser/child_process_security_policy.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc
index 201918b..c2c6cc8 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc
@@ -16,8 +16,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/file_manager_private.h"
 #include "chromeos/disks/disk_mount_manager.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/event_logger.h"
-#include "components/drive/file_system_interface.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/drive/task_util.h"
 #include "ui/shell_dialogs/selected_file_info.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc
index eb81bec..2dc04a7 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc
@@ -22,9 +22,9 @@
 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/file_manager_private.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system_interface.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #include "storage/browser/fileapi/file_system_url.h"
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
index 628ab9f..ff124e4 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
@@ -24,7 +24,7 @@
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/chromeos_switches.h"
-#include "components/drive/file_system_interface.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
diff --git a/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc b/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc
index b35d5f3..f0db18e 100644
--- a/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc
+++ b/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc
@@ -8,8 +8,8 @@
 #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/fake_file_system.h"
+#include "components/drive/chromeos/drive_test_util.h"
+#include "components/drive/chromeos/fake_file_system.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 231fbd1..8188d34 100644
--- a/chrome/browser/chromeos/file_manager/filesystem_api_util.cc
+++ b/chrome/browser/chromeos/file_manager/filesystem_api_util.cc
@@ -15,9 +15,9 @@
 #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/chromeos/file_system_interface.h"
 #include "components/drive/file_errors.h"
 #include "components/drive/file_system_core_util.h"
-#include "components/drive/file_system_interface.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "google_apis/drive/task_util.h"
diff --git a/chrome/browser/chromeos/file_manager/volume_manager.cc b/chrome/browser/chromeos/file_manager/volume_manager.cc
index cee0c4af..328cce0 100644
--- a/chrome/browser/chromeos/file_manager/volume_manager.cc
+++ b/chrome/browser/chromeos/file_manager/volume_manager.cc
@@ -30,8 +30,8 @@
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/disks/disk_mount_manager.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/file_system_core_util.h"
-#include "components/drive/file_system_interface.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc b/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc
index 3726b5d..f445072 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
@@ -21,8 +21,8 @@
 #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/fake_file_system.h"
+#include "components/drive/chromeos/drive_test_util.h"
+#include "components/drive/chromeos/fake_file_system.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/extensions/api/file_system/file_system_apitest_chromeos.cc b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
index d56001d..8c9eb0f 100644
--- a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
+++ b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
@@ -21,7 +21,7 @@
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/api/file_system.h"
-#include "components/drive/file_system_interface.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/event_router.h"
diff --git a/chrome/browser/ui/ash/chrome_screenshot_grabber.cc b/chrome/browser/ui/ash/chrome_screenshot_grabber.cc
index b9a0bf3..f48b0fe3 100644
--- a/chrome/browser/ui/ash/chrome_screenshot_grabber.cc
+++ b/chrome/browser/ui/ash/chrome_screenshot_grabber.cc
@@ -41,7 +41,7 @@
 #include "chrome/browser/notifications/notifier_state_tracker.h"
 #include "chrome/browser/notifications/notifier_state_tracker_factory.h"
 #include "chromeos/login/login_state.h"
-#include "components/drive/file_system_interface.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #endif
 
 namespace {
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 41cefb0..186c42e 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -1121,6 +1121,7 @@
         '../components/components.gyp:certificate_reporting',
         '../components/components.gyp:cloud_policy_proto',
         '../components/components.gyp:drive',
+        '../components/components.gyp:drive_chromeos',
         '../components/components.gyp:flags_ui',
         '../components/components.gyp:login',
         '../components/components.gyp:onc_component',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 2bd3661..c6d4ea0 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -922,43 +922,46 @@
       'renderer/resources/extensions/notifications_custom_bindings.gtestjs',
       'test/data/unit/framework_unittest.gtestjs',
     ],
-    'chrome_unit_tests_chromeos_sources': [
-      # TODO(lukasza): Move Drive tests outside of CrOS (crbug.com/498951).
-      '../components/drive/change_list_loader_unittest.cc',
-      '../components/drive/change_list_processor_unittest.cc',
-      '../components/drive/directory_loader_unittest.cc',
-      '../components/drive/fake_file_system_unittest.cc',
-      '../components/drive/file_cache_unittest.cc',
+    'chrome_unit_tests_drive_sources': [
       '../components/drive/file_change_unittest.cc',
-      '../components/drive/file_system/copy_operation_unittest.cc',
-      '../components/drive/file_system/create_directory_operation_unittest.cc',
-      '../components/drive/file_system/create_file_operation_unittest.cc',
-      '../components/drive/file_system/download_operation_unittest.cc',
-      '../components/drive/file_system/get_file_for_saving_operation_unittest.cc',
-      '../components/drive/file_system/move_operation_unittest.cc',
-      '../components/drive/file_system/open_file_operation_unittest.cc',
-      '../components/drive/file_system/operation_test_base.cc',
-      '../components/drive/file_system/operation_test_base.h',
-      '../components/drive/file_system/remove_operation_unittest.cc',
-      '../components/drive/file_system/search_operation_unittest.cc',
-      '../components/drive/file_system/set_property_operation_unittest.cc',
-      '../components/drive/file_system/touch_operation_unittest.cc',
-      '../components/drive/file_system/truncate_operation_unittest.cc',
       '../components/drive/file_system_core_util_unittest.cc',
-      '../components/drive/file_system_unittest.cc',
       '../components/drive/file_write_watcher_unittest.cc',
       '../components/drive/job_queue_unittest.cc',
       '../components/drive/job_scheduler_unittest.cc',
       '../components/drive/local_file_reader_unittest.cc',
-      '../components/drive/remove_stale_cache_files_unittest.cc',
       '../components/drive/resource_entry_conversion_unittest.cc',
       '../components/drive/resource_metadata_storage_unittest.cc',
-      '../components/drive/resource_metadata_unittest.cc',
-      '../components/drive/search_metadata_unittest.cc',
-      '../components/drive/sync/entry_revert_performer_unittest.cc',
-      '../components/drive/sync/entry_update_performer_unittest.cc',
-      '../components/drive/sync/remove_performer_unittest.cc',
-      '../components/drive/sync_client_unittest.cc',
+    ],
+    'chrome_unit_tests_drive_chromeos_sources': [
+      '../components/drive/chromeos/change_list_loader_unittest.cc',
+      '../components/drive/chromeos/change_list_processor_unittest.cc',
+      '../components/drive/chromeos/directory_loader_unittest.cc',
+      '../components/drive/chromeos/fake_file_system_unittest.cc',
+      '../components/drive/chromeos/file_cache_unittest.cc',
+      '../components/drive/chromeos/file_system/copy_operation_unittest.cc',
+      '../components/drive/chromeos/file_system/create_directory_operation_unittest.cc',
+      '../components/drive/chromeos/file_system/create_file_operation_unittest.cc',
+      '../components/drive/chromeos/file_system/download_operation_unittest.cc',
+      '../components/drive/chromeos/file_system/get_file_for_saving_operation_unittest.cc',
+      '../components/drive/chromeos/file_system/move_operation_unittest.cc',
+      '../components/drive/chromeos/file_system/open_file_operation_unittest.cc',
+      '../components/drive/chromeos/file_system/operation_test_base.cc',
+      '../components/drive/chromeos/file_system/operation_test_base.h',
+      '../components/drive/chromeos/file_system/remove_operation_unittest.cc',
+      '../components/drive/chromeos/file_system/search_operation_unittest.cc',
+      '../components/drive/chromeos/file_system/set_property_operation_unittest.cc',
+      '../components/drive/chromeos/file_system/touch_operation_unittest.cc',
+      '../components/drive/chromeos/file_system/truncate_operation_unittest.cc',
+      '../components/drive/chromeos/file_system_unittest.cc',
+      '../components/drive/chromeos/remove_stale_cache_files_unittest.cc',
+      '../components/drive/chromeos/resource_metadata_unittest.cc',
+      '../components/drive/chromeos/search_metadata_unittest.cc',
+      '../components/drive/chromeos/sync/entry_revert_performer_unittest.cc',
+      '../components/drive/chromeos/sync/entry_update_performer_unittest.cc',
+      '../components/drive/chromeos/sync/remove_performer_unittest.cc',
+      '../components/drive/chromeos/sync_client_unittest.cc',
+    ],
+    'chrome_unit_tests_chromeos_sources': [
       'browser/chromeos/accessibility/magnification_manager_unittest.cc',
       'browser/chromeos/accessibility/spoken_feedback_event_rewriter_unittest.cc',
       'browser/chromeos/attestation/attestation_ca_client_unittest.cc',
@@ -2544,10 +2547,14 @@
             '<@(chrome_unit_tests_chromeos_sources)',
             '<@(chrome_unit_tests_chromeos_gtestjs_sources)',
             '<@(chrome_unit_tests_chromeos_js_sources)',
+            # TODO(yawano): Move chrome_unit_tests_drive_sources to non chromeos build.
+            '<@(chrome_unit_tests_drive_sources)',
+            '<@(chrome_unit_tests_drive_chromeos_sources)',
           ],
           'dependencies': [
             '../ash/ash_resources.gyp:ash_resources',
             '../components/components.gyp:drive_test_support',
+            '../components/components.gyp:drive_test_support_chromeos',
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
           ],
           'sources!': [
diff --git a/components/drive.gypi b/components/drive.gypi
index 781f546..18e09bb 100644
--- a/components/drive.gypi
+++ b/components/drive.gypi
@@ -27,13 +27,6 @@
         '../third_party/re2/re2.gyp:re2',
       ],
       'sources': [
-        'drive/change_list_loader.cc',
-        'drive/change_list_loader.h',
-        'drive/change_list_loader_observer.h',
-        'drive/change_list_processor.cc',
-        'drive/change_list_processor.h',
-        'drive/directory_loader.cc',
-        'drive/directory_loader.h',
         'drive/drive_api_util.cc',
         'drive/drive_api_util.h',
         'drive/drive_app_registry.cc',
@@ -48,47 +41,14 @@
         'drive/drive_uploader.h',
         'drive/event_logger.cc',
         'drive/event_logger.h',
-        'drive/file_cache.cc',
-        'drive/file_cache.h',
         'drive/file_change.cc',
         'drive/file_change.h',
         'drive/file_errors.cc',
         'drive/file_errors.h',
-        'drive/file_system.cc',
-        'drive/file_system.h',
-        'drive/file_system/copy_operation.cc',
-        'drive/file_system/copy_operation.h',
-        'drive/file_system/create_directory_operation.cc',
-        'drive/file_system/create_directory_operation.h',
-        'drive/file_system/create_file_operation.cc',
-        'drive/file_system/create_file_operation.h',
-        'drive/file_system/download_operation.cc',
-        'drive/file_system/download_operation.h',
-        'drive/file_system/get_file_for_saving_operation.cc',
-        'drive/file_system/get_file_for_saving_operation.h',
-        'drive/file_system/move_operation.cc',
-        'drive/file_system/move_operation.h',
-        'drive/file_system/open_file_operation.cc',
-        'drive/file_system/open_file_operation.h',
-        'drive/file_system/operation_delegate.cc',
-        'drive/file_system/operation_delegate.h',
-        'drive/file_system/remove_operation.cc',
-        'drive/file_system/remove_operation.h',
-        'drive/file_system/search_operation.cc',
-        'drive/file_system/search_operation.h',
-        'drive/file_system/set_property_operation.cc',
-        'drive/file_system/set_property_operation.h',
-        'drive/file_system/touch_operation.cc',
-        'drive/file_system/touch_operation.h',
-        'drive/file_system/truncate_operation.cc',
-        'drive/file_system/truncate_operation.h',
         'drive/file_system_core_util.cc',
         'drive/file_system_core_util.h',
-        'drive/file_system_interface.cc',
-        'drive/file_system_interface.h',
         'drive/file_system_metadata.cc',
         'drive/file_system_metadata.h',
-        'drive/file_system_observer.h',
         'drive/file_write_watcher.cc',
         'drive/file_write_watcher.h',
         'drive/job_list.cc',
@@ -99,30 +59,87 @@
         'drive/job_scheduler.h',
         'drive/local_file_reader.cc',
         'drive/local_file_reader.h',
-        'drive/remove_stale_cache_files.cc',
-        'drive/remove_stale_cache_files.h',
         'drive/resource_entry_conversion.cc',
         'drive/resource_entry_conversion.h',
-        'drive/resource_metadata.cc',
-        'drive/resource_metadata.h',
         'drive/resource_metadata_storage.cc',
         'drive/resource_metadata_storage.h',
-        'drive/search_metadata.cc',
-        'drive/search_metadata.h',
         'drive/service/drive_api_service.cc',
         'drive/service/drive_api_service.h',
         'drive/service/drive_service_interface.cc',
         'drive/service/drive_service_interface.h',
-        'drive/sync/entry_revert_performer.cc',
-        'drive/sync/entry_revert_performer.h',
-        'drive/sync/entry_update_performer.cc',
-        'drive/sync/entry_update_performer.h',
-        'drive/sync/remove_performer.cc',
-        'drive/sync/remove_performer.h',
-        'drive/sync_client.cc',
-        'drive/sync_client.h',
       ],
     },
+    {
+      # GN version: //components/drive:drive_chromeos
+      'target_name': 'drive_chromeos',
+      'type': 'static_library',
+      'include_dirs': [
+        '..',
+      ],
+      'dependencies': [
+        'drive',
+        'drive_proto',
+        '../base/base.gyp:base',
+        '../google_apis/google_apis.gyp:google_apis',
+        '../net/net.gyp:net',
+      ],
+      'sources': [
+        'drive/chromeos/change_list_loader.cc',
+        'drive/chromeos/change_list_loader.h',
+        'drive/chromeos/change_list_loader_observer.h',
+        'drive/chromeos/change_list_processor.cc',
+        'drive/chromeos/change_list_processor.h',
+        'drive/chromeos/directory_loader.cc',
+        'drive/chromeos/directory_loader.h',
+        'drive/chromeos/file_cache.cc',
+        'drive/chromeos/file_cache.h',
+        'drive/chromeos/file_system.cc',
+        'drive/chromeos/file_system.h',
+        'drive/chromeos/file_system/copy_operation.cc',
+        'drive/chromeos/file_system/copy_operation.h',
+        'drive/chromeos/file_system/create_directory_operation.cc',
+        'drive/chromeos/file_system/create_directory_operation.h',
+        'drive/chromeos/file_system/create_file_operation.cc',
+        'drive/chromeos/file_system/create_file_operation.h',
+        'drive/chromeos/file_system/download_operation.cc',
+        'drive/chromeos/file_system/download_operation.h',
+        'drive/chromeos/file_system/get_file_for_saving_operation.cc',
+        'drive/chromeos/file_system/get_file_for_saving_operation.h',
+        'drive/chromeos/file_system/move_operation.cc',
+        'drive/chromeos/file_system/move_operation.h',
+        'drive/chromeos/file_system/open_file_operation.cc',
+        'drive/chromeos/file_system/open_file_operation.h',
+        'drive/chromeos/file_system/operation_delegate.cc',
+        'drive/chromeos/file_system/operation_delegate.h',
+        'drive/chromeos/file_system/remove_operation.cc',
+        'drive/chromeos/file_system/remove_operation.h',
+        'drive/chromeos/file_system/search_operation.cc',
+        'drive/chromeos/file_system/search_operation.h',
+        'drive/chromeos/file_system/set_property_operation.cc',
+        'drive/chromeos/file_system/set_property_operation.h',
+        'drive/chromeos/file_system/touch_operation.cc',
+        'drive/chromeos/file_system/touch_operation.h',
+        'drive/chromeos/file_system/truncate_operation.cc',
+        'drive/chromeos/file_system/truncate_operation.h',
+        'drive/chromeos/file_system_interface.cc',
+        'drive/chromeos/file_system_interface.h',
+        'drive/chromeos/file_system_observer.h',
+        'drive/chromeos/remove_stale_cache_files.cc',
+        'drive/chromeos/remove_stale_cache_files.h',
+        'drive/chromeos/resource_metadata.cc',
+        'drive/chromeos/resource_metadata.h',
+        'drive/chromeos/search_metadata.cc',
+        'drive/chromeos/search_metadata.h',
+        'drive/chromeos/sync/entry_revert_performer.cc',
+        'drive/chromeos/sync/entry_revert_performer.h',
+        'drive/chromeos/sync/entry_update_performer.cc',
+        'drive/chromeos/sync/entry_update_performer.h',
+        'drive/chromeos/sync/remove_performer.cc',
+        'drive/chromeos/sync/remove_performer.h',
+        'drive/chromeos/sync_client.cc',
+        'drive/chromeos/sync_client.h',
+      ]
+    },
 
     {
       # GN version: //components/drive:proto
@@ -153,14 +170,6 @@
         '../net/net.gyp:net',
       ],
       'sources': [
-        "drive/drive_test_util.cc",
-        "drive/drive_test_util.h",
-        "drive/dummy_file_system.cc",
-        "drive/dummy_file_system.h",
-        "drive/fake_file_system.cc",
-        "drive/fake_file_system.h",
-        "drive/fake_free_disk_space_getter.cc",
-        "drive/fake_free_disk_space_getter.h",
         "drive/service/dummy_drive_service.cc",
         "drive/service/dummy_drive_service.h",
         "drive/service/fake_drive_service.cc",
@@ -169,6 +178,32 @@
         "drive/service/test_util.h",
       ],
     },
+    {
+      # GN version: //components/drive:test_support_chromeos
+      'target_name': 'drive_test_support_chromeos',
+      'type': 'static_library',
+      'include_dirs': [
+        '..',
+      ],
+      'dependencies': [
+        'drive',
+        'drive_chromeos',
+        'drive_proto',
+        '../base/base.gyp:base',
+        '../content/content_shell_and_tests.gyp:test_support_content',
+        '../google_apis/google_apis.gyp:google_apis',
+      ],
+      'sources': [
+        "drive/chromeos/drive_test_util.cc",
+        "drive/chromeos/drive_test_util.h",
+        "drive/chromeos/dummy_file_system.cc",
+        "drive/chromeos/dummy_file_system.h",
+        "drive/chromeos/fake_file_system.cc",
+        "drive/chromeos/fake_file_system.h",
+        "drive/chromeos/fake_free_disk_space_getter.cc",
+        "drive/chromeos/fake_free_disk_space_getter.h",
+      ],
+    },
 
     # TODO(lukasza): drive_unittests target.
     # Currently tests are built as part of chrome/chrome_tests_unit.gypi.
diff --git a/components/drive/BUILD.gn b/components/drive/BUILD.gn
index c1957fb..dfbffef 100644
--- a/components/drive/BUILD.gn
+++ b/components/drive/BUILD.gn
@@ -6,13 +6,6 @@ import("//third_party/protobuf/proto_library.gni")
 
 source_set("drive") {
   sources = [
-    "change_list_loader.cc",
-    "change_list_loader.h",
-    "change_list_loader_observer.h",
-    "change_list_processor.cc",
-    "change_list_processor.h",
-    "directory_loader.cc",
-    "directory_loader.h",
     "drive_api_util.cc",
     "drive_api_util.h",
     "drive_app_registry.cc",
@@ -27,47 +20,14 @@ source_set("drive") {
     "drive_uploader.h",
     "event_logger.cc",
     "event_logger.h",
-    "file_cache.cc",
-    "file_cache.h",
     "file_change.cc",
     "file_change.h",
     "file_errors.cc",
     "file_errors.h",
-    "file_system.cc",
-    "file_system.h",
-    "file_system/copy_operation.cc",
-    "file_system/copy_operation.h",
-    "file_system/create_directory_operation.cc",
-    "file_system/create_directory_operation.h",
-    "file_system/create_file_operation.cc",
-    "file_system/create_file_operation.h",
-    "file_system/download_operation.cc",
-    "file_system/download_operation.h",
-    "file_system/get_file_for_saving_operation.cc",
-    "file_system/get_file_for_saving_operation.h",
-    "file_system/move_operation.cc",
-    "file_system/move_operation.h",
-    "file_system/open_file_operation.cc",
-    "file_system/open_file_operation.h",
-    "file_system/operation_delegate.cc",
-    "file_system/operation_delegate.h",
-    "file_system/remove_operation.cc",
-    "file_system/remove_operation.h",
-    "file_system/search_operation.cc",
-    "file_system/search_operation.h",
-    "file_system/set_property_operation.cc",
-    "file_system/set_property_operation.h",
-    "file_system/touch_operation.cc",
-    "file_system/touch_operation.h",
-    "file_system/truncate_operation.cc",
-    "file_system/truncate_operation.h",
     "file_system_core_util.cc",
     "file_system_core_util.h",
-    "file_system_interface.cc",
-    "file_system_interface.h",
     "file_system_metadata.cc",
     "file_system_metadata.h",
-    "file_system_observer.h",
     "file_write_watcher.cc",
     "file_write_watcher.h",
     "job_list.cc",
@@ -78,28 +38,14 @@ source_set("drive") {
     "job_scheduler.h",
     "local_file_reader.cc",
     "local_file_reader.h",
-    "remove_stale_cache_files.cc",
-    "remove_stale_cache_files.h",
     "resource_entry_conversion.cc",
     "resource_entry_conversion.h",
-    "resource_metadata.cc",
-    "resource_metadata.h",
     "resource_metadata_storage.cc",
     "resource_metadata_storage.h",
-    "search_metadata.cc",
-    "search_metadata.h",
     "service/drive_api_service.cc",
     "service/drive_api_service.h",
     "service/drive_service_interface.cc",
     "service/drive_service_interface.h",
-    "sync/entry_revert_performer.cc",
-    "sync/entry_revert_performer.h",
-    "sync/entry_update_performer.cc",
-    "sync/entry_update_performer.h",
-    "sync/remove_performer.cc",
-    "sync/remove_performer.h",
-    "sync_client.cc",
-    "sync_client.h",
   ]
   deps = [
     "//base",
@@ -121,6 +67,76 @@ source_set("drive") {
   ]
 }
 
+source_set("drive_chromeos") {
+  sources = [
+    "chromeos/change_list_loader.cc",
+    "chromeos/change_list_loader.h",
+    "chromeos/change_list_loader_observer.h",
+    "chromeos/change_list_processor.cc",
+    "chromeos/change_list_processor.h",
+    "chromeos/directory_loader.cc",
+    "chromeos/directory_loader.h",
+    "chromeos/file_cache.cc",
+    "chromeos/file_cache.h",
+    "chromeos/file_system.cc",
+    "chromeos/file_system.h",
+    "chromeos/file_system/copy_operation.cc",
+    "chromeos/file_system/copy_operation.h",
+    "chromeos/file_system/create_directory_operation.cc",
+    "chromeos/file_system/create_directory_operation.h",
+    "chromeos/file_system/create_file_operation.cc",
+    "chromeos/file_system/create_file_operation.h",
+    "chromeos/file_system/download_operation.cc",
+    "chromeos/file_system/download_operation.h",
+    "chromeos/file_system/get_file_for_saving_operation.cc",
+    "chromeos/file_system/get_file_for_saving_operation.h",
+    "chromeos/file_system/move_operation.cc",
+    "chromeos/file_system/move_operation.h",
+    "chromeos/file_system/open_file_operation.cc",
+    "chromeos/file_system/open_file_operation.h",
+    "chromeos/file_system/operation_delegate.cc",
+    "chromeos/file_system/operation_delegate.h",
+    "chromeos/file_system/remove_operation.cc",
+    "chromeos/file_system/remove_operation.h",
+    "chromeos/file_system/search_operation.cc",
+    "chromeos/file_system/search_operation.h",
+    "chromeos/file_system/set_property_operation.cc",
+    "chromeos/file_system/set_property_operation.h",
+    "chromeos/file_system/touch_operation.cc",
+    "chromeos/file_system/touch_operation.h",
+    "chromeos/file_system/truncate_operation.cc",
+    "chromeos/file_system/truncate_operation.h",
+    "chromeos/file_system_interface.cc",
+    "chromeos/file_system_interface.h",
+    "chromeos/file_system_observer.h",
+    "chromeos/remove_stale_cache_files.cc",
+    "chromeos/remove_stale_cache_files.h",
+    "chromeos/resource_metadata.cc",
+    "chromeos/resource_metadata.h",
+    "chromeos/search_metadata.cc",
+    "chromeos/search_metadata.h",
+    "chromeos/sync/entry_revert_performer.cc",
+    "chromeos/sync/entry_revert_performer.h",
+    "chromeos/sync/entry_update_performer.cc",
+    "chromeos/sync/entry_update_performer.h",
+    "chromeos/sync/remove_performer.cc",
+    "chromeos/sync/remove_performer.h",
+    "chromeos/sync_client.cc",
+    "chromeos/sync_client.h",
+  ]
+  deps = [
+    ":drive",
+    "//base",
+    "//base:i18n",
+    "//base:prefs",
+    "//google_apis:google_apis",
+    "//net:net",
+  ]
+  public_deps = [
+    ":proto",
+  ]
+}
+
 proto_library("proto") {
   sources = [
     "drive.proto",
@@ -130,14 +146,6 @@ proto_library("proto") {
 source_set("test_support") {
   testonly = true
   sources = [
-    "drive_test_util.cc",
-    "drive_test_util.h",
-    "dummy_file_system.cc",
-    "dummy_file_system.h",
-    "fake_file_system.cc",
-    "fake_file_system.h",
-    "fake_free_disk_space_getter.cc",
-    "fake_free_disk_space_getter.h",
     "service/dummy_drive_service.cc",
     "service/dummy_drive_service.h",
     "service/fake_drive_service.cc",
@@ -149,9 +157,31 @@ source_set("test_support") {
     ":drive",
     ":proto",
     "//base",
-    "//base:prefs_test_support",
     "//content/test:test_support",
     "//google_apis:test_support",
     "//net:net",
   ]
 }
+
+source_set("test_support_chromeos") {
+  testonly = true
+  sources = [
+    "chromeos/drive_test_util.cc",
+    "chromeos/drive_test_util.h",
+    "chromeos/dummy_file_system.cc",
+    "chromeos/dummy_file_system.h",
+    "chromeos/fake_file_system.cc",
+    "chromeos/fake_file_system.h",
+    "chromeos/fake_free_disk_space_getter.cc",
+    "chromeos/fake_free_disk_space_getter.h",
+  ]
+  deps = [
+    ":drive",
+    ":drive_chromeos",
+    "//base",
+    "//base:prefs",
+    "//base:prefs_test_support",
+    "//content/test:test_support",
+    "//google_apis:test_support",
+  ]
+}
diff --git a/components/drive/change_list_loader.cc b/components/drive/chromeos/change_list_loader.cc
index b7b5bd6..b8a08c5 100644
--- a/components/drive/change_list_loader.cc
+++ b/components/drive/chromeos/change_list_loader.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 "components/drive/change_list_loader.h"
+#include "components/drive/chromeos/change_list_loader.h"
 
 #include <stddef.h>
 #include <set>
@@ -16,12 +16,12 @@
 #include "base/synchronization/cancellation_flag.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
-#include "components/drive/change_list_loader_observer.h"
-#include "components/drive/change_list_processor.h"
+#include "components/drive/chromeos/change_list_loader_observer.h"
+#include "components/drive/chromeos/change_list_processor.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/event_logger.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "url/gurl.h"
 
diff --git a/components/drive/change_list_loader.h b/components/drive/chromeos/change_list_loader.h
index 07287b5..70b77ce 100644
--- a/components/drive/change_list_loader.h
+++ b/components/drive/chromeos/change_list_loader.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 COMPONENTS_DRIVE_CHANGE_LIST_LOADER_H_
-#define COMPONENTS_DRIVE_CHANGE_LIST_LOADER_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_CHANGE_LIST_LOADER_H_
+#define COMPONENTS_DRIVE_CHROMEOS_CHANGE_LIST_LOADER_H_
 
 #include <stdint.h>
 
@@ -249,4 +249,4 @@ class ChangeListLoader {
 }  // namespace internal
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_CHANGE_LIST_LOADER_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_CHANGE_LIST_LOADER_H_
diff --git a/components/drive/change_list_loader_observer.h b/components/drive/chromeos/change_list_loader_observer.h
index 0a9e810..d795f89 100644
--- a/components/drive/change_list_loader_observer.h
+++ b/components/drive/chromeos/change_list_loader_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_CHANGE_LIST_LOADER_OBSERVER_H_
-#define COMPONENTS_DRIVE_CHANGE_LIST_LOADER_OBSERVER_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_CHANGE_LIST_LOADER_OBSERVER_H_
+#define COMPONENTS_DRIVE_CHROMEOS_CHANGE_LIST_LOADER_OBSERVER_H_
 
 namespace base {
 class FilePath;
@@ -41,4 +41,4 @@ class ChangeListLoaderObserver {
 }  // namespace internal
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_CHANGE_LIST_LOADER_OBSERVER_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_CHANGE_LIST_LOADER_OBSERVER_H_
diff --git a/components/drive/change_list_loader_unittest.cc b/components/drive/chromeos/change_list_loader_unittest.cc
index cef19aef..e1fa2d0 100644
--- a/components/drive/change_list_loader_unittest.cc
+++ b/components/drive/chromeos/change_list_loader_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 "components/drive/change_list_loader.h"
+#include "components/drive/chromeos/change_list_loader.h"
 
 #include <stdint.h>
 
@@ -14,14 +14,14 @@
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
-#include "components/drive/change_list_loader_observer.h"
-#include "components/drive/drive_test_util.h"
+#include "components/drive/chromeos/change_list_loader_observer.h"
+#include "components/drive/chromeos/drive_test_util.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/event_logger.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.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/components/drive/change_list_processor.cc b/components/drive/chromeos/change_list_processor.cc
index f425320..514b2fb6 100644
--- a/components/drive/change_list_processor.cc
+++ b/components/drive/chromeos/change_list_processor.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 "components/drive/change_list_processor.h"
+#include "components/drive/chromeos/change_list_processor.h"
 
 #include <stddef.h>
 #include <utility>
@@ -10,12 +10,12 @@
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/cancellation_flag.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_api_util.h"
 #include "components/drive/file_change.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/resource_entry_conversion.h"
-#include "components/drive/resource_metadata.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 namespace drive {
diff --git a/components/drive/change_list_processor.h b/components/drive/chromeos/change_list_processor.h
index 2c2fe62..310c1d5 100644
--- a/components/drive/change_list_processor.h
+++ b/components/drive/chromeos/change_list_processor.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 COMPONENTS_DRIVE_CHANGE_LIST_PROCESSOR_H_
-#define COMPONENTS_DRIVE_CHANGE_LIST_PROCESSOR_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_CHANGE_LIST_PROCESSOR_H_
+#define COMPONENTS_DRIVE_CHROMEOS_CHANGE_LIST_PROCESSOR_H_
 
 #include <stdint.h>
 
@@ -170,4 +170,4 @@ class ChangeListProcessor {
 }  // namespace internal
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_CHANGE_LIST_PROCESSOR_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_CHANGE_LIST_PROCESSOR_H_
diff --git a/components/drive/change_list_processor_unittest.cc b/components/drive/chromeos/change_list_processor_unittest.cc
index 1d1f73e..0584c5f 100644
--- a/components/drive/change_list_processor_unittest.cc
+++ b/components/drive/chromeos/change_list_processor_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 "components/drive/change_list_processor.h"
+#include "components/drive/chromeos/change_list_processor.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -13,13 +13,13 @@
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
+#include "components/drive/chromeos/drive_test_util.h"
+#include "components/drive/chromeos/fake_free_disk_space_getter.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/drive_test_util.h"
-#include "components/drive/fake_free_disk_space_getter.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
 #include "components/drive/file_system_core_util.h"
-#include "components/drive/resource_metadata.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/components/drive/directory_loader.cc b/components/drive/chromeos/directory_loader.cc
index ad42626..593ae8e 100644
--- a/components/drive/directory_loader.cc
+++ b/components/drive/chromeos/directory_loader.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 "components/drive/directory_loader.h"
+#include "components/drive/chromeos/directory_loader.h"
 
 #include <stddef.h>
 #include <utility>
@@ -13,13 +13,13 @@
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
-#include "components/drive/change_list_loader.h"
-#include "components/drive/change_list_loader_observer.h"
-#include "components/drive/change_list_processor.h"
+#include "components/drive/chromeos/change_list_loader.h"
+#include "components/drive/chromeos/change_list_loader_observer.h"
+#include "components/drive/chromeos/change_list_processor.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/event_logger.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "url/gurl.h"
 
diff --git a/components/drive/directory_loader.h b/components/drive/chromeos/directory_loader.h
index 776c5fd..11cab3c 100644
--- a/components/drive/directory_loader.h
+++ b/components/drive/chromeos/directory_loader.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 COMPONENTS_DRIVE_DIRECTORY_LOADER_H_
-#define COMPONENTS_DRIVE_DIRECTORY_LOADER_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_DIRECTORY_LOADER_H_
+#define COMPONENTS_DRIVE_CHROMEOS_DIRECTORY_LOADER_H_
 
 #include <stdint.h>
 
@@ -18,8 +18,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system_interface.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 #include "google_apis/drive/drive_common_callbacks.h"
 
@@ -150,4 +150,4 @@ class DirectoryLoader {
 }  // namespace internal
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_DIRECTORY_LOADER_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_DIRECTORY_LOADER_H_
diff --git a/components/drive/directory_loader_unittest.cc b/components/drive/chromeos/directory_loader_unittest.cc
index 810a3db..91cf70e 100644
--- a/components/drive/directory_loader_unittest.cc
+++ b/components/drive/chromeos/directory_loader_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 "components/drive/directory_loader.h"
+#include "components/drive/chromeos/directory_loader.h"
 
 #include "base/callback_helpers.h"
 #include "base/files/scoped_temp_dir.h"
@@ -12,14 +12,14 @@
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
-#include "components/drive/change_list_loader.h"
-#include "components/drive/change_list_loader_observer.h"
-#include "components/drive/drive_test_util.h"
+#include "components/drive/chromeos/change_list_loader.h"
+#include "components/drive/chromeos/change_list_loader_observer.h"
+#include "components/drive/chromeos/drive_test_util.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/event_logger.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.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/components/drive/drive_test_util.cc b/components/drive/chromeos/drive_test_util.cc
index 48bece2..12e50a8 100644
--- a/components/drive/drive_test_util.cc
+++ b/components/drive/chromeos/drive_test_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/drive_test_util.h"
+#include "components/drive/chromeos/drive_test_util.h"
 
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
diff --git a/components/drive/drive_test_util.h b/components/drive/chromeos/drive_test_util.h
index 88bb9b2..d448e6c 100644
--- a/components/drive/drive_test_util.h
+++ b/components/drive/chromeos/drive_test_util.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_DRIVE_TEST_UTIL_H_
-#define COMPONENTS_DRIVE_DRIVE_TEST_UTIL_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_DRIVE_TEST_UTIL_H_
+#define COMPONENTS_DRIVE_CHROMEOS_DRIVE_TEST_UTIL_H_
 
 #include <stdint.h>
 
 #include <string>
 
-#include "components/drive/file_cache.h"
+#include "components/drive/chromeos/file_cache.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/test_util.h"
 #include "net/base/completion_callback.h"
@@ -83,4 +83,4 @@ class FakeNetworkChangeNotifier : public net::NetworkChangeNotifier {
 }  // namespace test_util
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_DRIVE_TEST_UTIL_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_DRIVE_TEST_UTIL_H_
diff --git a/components/drive/dummy_file_system.cc b/components/drive/chromeos/dummy_file_system.cc
index 7c92271..1d18223 100644
--- a/components/drive/dummy_file_system.cc
+++ b/components/drive/chromeos/dummy_file_system.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 "components/drive/dummy_file_system.h"
+#include "components/drive/chromeos/dummy_file_system.h"
 
 namespace drive {
 
diff --git a/components/drive/dummy_file_system.h b/components/drive/chromeos/dummy_file_system.h
index 9a13654..f78dfca 100644
--- a/components/drive/dummy_file_system.h
+++ b/components/drive/chromeos/dummy_file_system.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_DUMMY_FILE_SYSTEM_H_
-#define COMPONENTS_DRIVE_DUMMY_FILE_SYSTEM_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_DUMMY_FILE_SYSTEM_H_
+#define COMPONENTS_DRIVE_CHROMEOS_DUMMY_FILE_SYSTEM_H_
 
 #include <stdint.h>
 
-#include "components/drive/file_system_interface.h"
+#include "components/drive/chromeos/file_system_interface.h"
 
 namespace drive {
 
@@ -110,4 +110,4 @@ class DummyFileSystem : public FileSystemInterface {
 
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_DUMMY_FILE_SYSTEM_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_DUMMY_FILE_SYSTEM_H_
diff --git a/components/drive/fake_file_system.cc b/components/drive/chromeos/fake_file_system.cc
index a14c91a..1a93d61 100644
--- a/components/drive/fake_file_system.cc
+++ b/components/drive/chromeos/fake_file_system.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 "components/drive/fake_file_system.h"
+#include "components/drive/chromeos/fake_file_system.h"
 
 #include <stddef.h>
 #include <utility>
diff --git a/components/drive/fake_file_system.h b/components/drive/chromeos/fake_file_system.h
index 6635166..c488a5f 100644
--- a/components/drive/fake_file_system.h
+++ b/components/drive/chromeos/fake_file_system.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 COMPONENTS_DRIVE_FAKE_FILE_SYSTEM_H_
-#define COMPONENTS_DRIVE_FAKE_FILE_SYSTEM_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FAKE_FILE_SYSTEM_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FAKE_FILE_SYSTEM_H_
 
 #include <stdint.h>
 
@@ -13,8 +13,8 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system_interface.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 namespace google_apis {
@@ -196,4 +196,4 @@ class FakeFileSystem : public FileSystemInterface {
 }  // namespace test_util
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FAKE_FILE_SYSTEM_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FAKE_FILE_SYSTEM_H_
diff --git a/components/drive/fake_file_system_unittest.cc b/components/drive/chromeos/fake_file_system_unittest.cc
index fcaa82c..69053be 100644
--- a/components/drive/fake_file_system_unittest.cc
+++ b/components/drive/chromeos/fake_file_system_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 "components/drive/fake_file_system.h"
+#include "components/drive/chromeos/fake_file_system.h"
 
 #include "base/files/file_util.h"
 #include "base/run_loop.h"
diff --git a/components/drive/fake_free_disk_space_getter.cc b/components/drive/chromeos/fake_free_disk_space_getter.cc
index 1444517..3620c22 100644
--- a/components/drive/fake_free_disk_space_getter.cc
+++ b/components/drive/chromeos/fake_free_disk_space_getter.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/fake_free_disk_space_getter.h"
+#include "components/drive/chromeos/fake_free_disk_space_getter.h"
 
-#include "components/drive/drive_test_util.h"
+#include "components/drive/chromeos/drive_test_util.h"
 
 namespace drive {
 
diff --git a/components/drive/fake_free_disk_space_getter.h b/components/drive/chromeos/fake_free_disk_space_getter.h
index 5d39ab9..3a71b3c 100644
--- a/components/drive/fake_free_disk_space_getter.h
+++ b/components/drive/chromeos/fake_free_disk_space_getter.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FAKE_FREE_DISK_SPACE_GETTER_H_
-#define COMPONENTS_DRIVE_FAKE_FREE_DISK_SPACE_GETTER_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FAKE_FREE_DISK_SPACE_GETTER_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FAKE_FREE_DISK_SPACE_GETTER_H_
 
 #include <stdint.h>
 
 #include <list>
 
 #include "base/macros.h"
-#include "components/drive/file_cache.h"
+#include "components/drive/chromeos/file_cache.h"
 
 namespace drive {
 
@@ -43,4 +43,4 @@ class FakeFreeDiskSpaceGetter : public internal::FreeDiskSpaceGetterInterface {
 
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FAKE_FREE_DISK_SPACE_GETTER_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FAKE_FREE_DISK_SPACE_GETTER_H_
diff --git a/components/drive/file_cache.cc b/components/drive/chromeos/file_cache.cc
index 16a7a91..d5bf22b 100644
--- a/components/drive/file_cache.cc
+++ b/components/drive/chromeos/file_cache.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 "components/drive/file_cache.h"
+#include "components/drive/chromeos/file_cache.h"
 
 #include <queue>
 #include <vector>
diff --git a/components/drive/file_cache.h b/components/drive/chromeos/file_cache.h
index ab53347..a8f4018 100644
--- a/components/drive/file_cache.h
+++ b/components/drive/chromeos/file_cache.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 COMPONENTS_DRIVE_FILE_CACHE_H_
-#define COMPONENTS_DRIVE_FILE_CACHE_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_CACHE_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_CACHE_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -222,4 +222,4 @@ class FileCache {
 }  // namespace internal
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_CACHE_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_CACHE_H_
diff --git a/components/drive/file_cache_unittest.cc b/components/drive/chromeos/file_cache_unittest.cc
index 3db588a..87b06df 100644
--- a/components/drive/file_cache_unittest.cc
+++ b/components/drive/chromeos/file_cache_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 "components/drive/file_cache.h"
+#include "components/drive/chromeos/file_cache.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -20,9 +20,9 @@
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
+#include "components/drive/chromeos/drive_test_util.h"
+#include "components/drive/chromeos/fake_free_disk_space_getter.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/drive_test_util.h"
-#include "components/drive/fake_free_disk_space_getter.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/resource_metadata_storage.h"
 #include "content/public/test/test_browser_thread_bundle.h"
diff --git a/components/drive/file_system.cc b/components/drive/chromeos/file_system.cc
index c42da59..a3c2ea0 100644
--- a/components/drive/file_system.cc
+++ b/components/drive/chromeos/file_system.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 "components/drive/file_system.h"
+#include "components/drive/chromeos/file_system.h"
 
 #include <stddef.h>
 #include <utility>
@@ -10,31 +10,31 @@
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/prefs/pref_service.h"
-#include "components/drive/change_list_loader.h"
-#include "components/drive/directory_loader.h"
+#include "components/drive/chromeos/change_list_loader.h"
+#include "components/drive/chromeos/directory_loader.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/file_system/copy_operation.h"
+#include "components/drive/chromeos/file_system/create_directory_operation.h"
+#include "components/drive/chromeos/file_system/create_file_operation.h"
+#include "components/drive/chromeos/file_system/download_operation.h"
+#include "components/drive/chromeos/file_system/get_file_for_saving_operation.h"
+#include "components/drive/chromeos/file_system/move_operation.h"
+#include "components/drive/chromeos/file_system/open_file_operation.h"
+#include "components/drive/chromeos/file_system/remove_operation.h"
+#include "components/drive/chromeos/file_system/search_operation.h"
+#include "components/drive/chromeos/file_system/set_property_operation.h"
+#include "components/drive/chromeos/file_system/touch_operation.h"
+#include "components/drive/chromeos/file_system/truncate_operation.h"
+#include "components/drive/chromeos/file_system_observer.h"
+#include "components/drive/chromeos/remove_stale_cache_files.h"
+#include "components/drive/chromeos/search_metadata.h"
+#include "components/drive/chromeos/sync_client.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_pref_names.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system/copy_operation.h"
-#include "components/drive/file_system/create_directory_operation.h"
-#include "components/drive/file_system/create_file_operation.h"
-#include "components/drive/file_system/download_operation.h"
-#include "components/drive/file_system/get_file_for_saving_operation.h"
-#include "components/drive/file_system/move_operation.h"
-#include "components/drive/file_system/open_file_operation.h"
-#include "components/drive/file_system/remove_operation.h"
-#include "components/drive/file_system/search_operation.h"
-#include "components/drive/file_system/set_property_operation.h"
-#include "components/drive/file_system/touch_operation.h"
-#include "components/drive/file_system/truncate_operation.h"
 #include "components/drive/file_system_core_util.h"
-#include "components/drive/file_system_observer.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/remove_stale_cache_files.h"
 #include "components/drive/resource_entry_conversion.h"
-#include "components/drive/search_metadata.h"
-#include "components/drive/sync_client.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 namespace drive {
diff --git a/components/drive/file_system.h b/components/drive/chromeos/file_system.h
index b17d955..5bfd688 100644
--- a/components/drive/file_system.h
+++ b/components/drive/chromeos/file_system.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 COMPONENTS_DRIVE_FILE_SYSTEM_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_H_
 
 #include <stdint.h>
 
@@ -15,9 +15,9 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
-#include "components/drive/change_list_loader_observer.h"
-#include "components/drive/file_system/operation_delegate.h"
-#include "components/drive/file_system_interface.h"
+#include "components/drive/chromeos/change_list_loader_observer.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 class PrefService;
@@ -311,4 +311,4 @@ class FileSystem : public FileSystemInterface,
 
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_H_
diff --git a/components/drive/file_system/copy_operation.cc b/components/drive/chromeos/file_system/copy_operation.cc
index 56f8021..c33f86e 100644
--- a/components/drive/file_system/copy_operation.cc
+++ b/components/drive/chromeos/file_system/copy_operation.cc
@@ -2,23 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/copy_operation.h"
+#include "components/drive/chromeos/file_system/copy_operation.h"
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/task_runner_util.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/file_system/create_file_operation.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_api_util.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system/create_file_operation.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_entry_conversion.h"
-#include "components/drive/resource_metadata.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 namespace drive {
diff --git a/components/drive/file_system/copy_operation.h b/components/drive/chromeos/file_system/copy_operation.h
index 3cd3b99..7bf0988 100644
--- a/components/drive/file_system/copy_operation.h
+++ b/components/drive/chromeos/file_system/copy_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_COPY_OPERATION_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_COPY_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_COPY_OPERATION_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_COPY_OPERATION_H_
 
 #include <string>
 #include <vector>
@@ -178,4 +178,4 @@ class CopyOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_COPY_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_COPY_OPERATION_H_
diff --git a/components/drive/file_system/copy_operation_unittest.cc b/components/drive/chromeos/file_system/copy_operation_unittest.cc
index 3491746..c56c069 100644
--- a/components/drive/file_system/copy_operation_unittest.cc
+++ b/components/drive/chromeos/file_system/copy_operation_unittest.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/copy_operation.h"
+#include "components/drive/chromeos/file_system/copy_operation.h"
 
 #include "base/files/file_util.h"
 #include "base/task_runner_util.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/file_system/operation_test_base.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive_api_util.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system/operation_test_base.h"
 #include "components/drive/file_system_core_util.h"
-#include "components/drive/resource_metadata.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/drive_api_parser.h"
diff --git a/components/drive/file_system/create_directory_operation.cc b/components/drive/chromeos/file_system/create_directory_operation.cc
index 664ae7f..512c5e1 100644
--- a/components/drive/file_system/create_directory_operation.cc
+++ b/components/drive/chromeos/file_system/create_directory_operation.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/create_directory_operation.h"
+#include "components/drive/chromeos/file_system/create_directory_operation.h"
 
 #include <stddef.h>
 
+#include "components/drive/chromeos/file_system/operation_delegate.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.h"
 
 namespace drive {
 namespace file_system {
diff --git a/components/drive/file_system/create_directory_operation.h b/components/drive/chromeos/file_system/create_directory_operation.h
index f4a040d..4a17c2d 100644
--- a/components/drive/file_system/create_directory_operation.h
+++ b/components/drive/chromeos/file_system/create_directory_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_CREATE_DIRECTORY_OPERATION_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_CREATE_DIRECTORY_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_CREATE_DIRECTORY_OPERATION_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_CREATE_DIRECTORY_OPERATION_H_
 
 #include <set>
 
@@ -76,4 +76,4 @@ class CreateDirectoryOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_CREATE_DIRECTORY_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_CREATE_DIRECTORY_OPERATION_H_
diff --git a/components/drive/file_system/create_directory_operation_unittest.cc b/components/drive/chromeos/file_system/create_directory_operation_unittest.cc
index df70157..e1c41d4 100644
--- a/components/drive/file_system/create_directory_operation_unittest.cc
+++ b/components/drive/chromeos/file_system/create_directory_operation_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/create_directory_operation.h"
+#include "components/drive/chromeos/file_system/create_directory_operation.h"
 
-#include "components/drive/file_system/operation_test_base.h"
+#include "components/drive/chromeos/file_system/operation_test_base.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/drive/file_system/create_file_operation.cc b/components/drive/chromeos/file_system/create_file_operation.cc
index 19a238e..4eb5fc5 100644
--- a/components/drive/file_system/create_file_operation.cc
+++ b/components/drive/chromeos/file_system/create_file_operation.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/create_file_operation.h"
+#include "components/drive/chromeos/file_system/create_file_operation.h"
 
 #include <string>
 
 #include "base/files/file_util.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.h"
 #include "net/base/mime_util.h"
 
 namespace drive {
diff --git a/components/drive/file_system/create_file_operation.h b/components/drive/chromeos/file_system/create_file_operation.h
index 996b580..e761b7a 100644
--- a/components/drive/file_system/create_file_operation.h
+++ b/components/drive/chromeos/file_system/create_file_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_CREATE_FILE_OPERATION_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_CREATE_FILE_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_CREATE_FILE_OPERATION_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_CREATE_FILE_OPERATION_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ -73,4 +73,4 @@ class CreateFileOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_CREATE_FILE_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_CREATE_FILE_OPERATION_H_
diff --git a/components/drive/file_system/create_file_operation_unittest.cc b/components/drive/chromeos/file_system/create_file_operation_unittest.cc
index 79b4456..5c50cdce 100644
--- a/components/drive/file_system/create_file_operation_unittest.cc
+++ b/components/drive/chromeos/file_system/create_file_operation_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/create_file_operation.h"
+#include "components/drive/chromeos/file_system/create_file_operation.h"
 
+#include "components/drive/chromeos/file_system/operation_test_base.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system/operation_test_base.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/drive/file_system/download_operation.cc b/components/drive/chromeos/file_system/download_operation.cc
index 0c490138..0793c8a 100644
--- a/components/drive/file_system/download_operation.cc
+++ b/components/drive/chromeos/file_system/download_operation.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/download_operation.h"
+#include "components/drive/chromeos/file_system/download_operation.h"
 
 #include <stdint.h>
 #include <utility>
@@ -13,14 +13,14 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/task_runner_util.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 namespace drive {
diff --git a/components/drive/file_system/download_operation.h b/components/drive/chromeos/file_system/download_operation.h
index ac5ffa6..062ddb8 100644
--- a/components/drive/file_system/download_operation.h
+++ b/components/drive/chromeos/file_system/download_operation.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_DOWNLOAD_OPERATION_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_DOWNLOAD_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_DOWNLOAD_OPERATION_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_DOWNLOAD_OPERATION_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system_interface.h"
 #include "components/drive/job_list.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
@@ -130,4 +130,4 @@ class DownloadOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_DOWNLOAD_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_DOWNLOAD_OPERATION_H_
diff --git a/components/drive/file_system/download_operation_unittest.cc b/components/drive/chromeos/file_system/download_operation_unittest.cc
index ebc0b7c..c6b7de4 100644
--- a/components/drive/file_system/download_operation_unittest.cc
+++ b/components/drive/chromeos/file_system/download_operation_unittest.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/download_operation.h"
+#include "components/drive/chromeos/file_system/download_operation.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/files/file_util.h"
 #include "base/task_runner_util.h"
-#include "components/drive/fake_free_disk_space_getter.h"
-#include "components/drive/file_cache.h"
+#include "components/drive/chromeos/fake_free_disk_space_getter.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/file_system/operation_test_base.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system/operation_test_base.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/service/fake_drive_service.h"
diff --git a/components/drive/file_system/get_file_for_saving_operation.cc b/components/drive/chromeos/file_system/get_file_for_saving_operation.cc
index 567e79f..24aa93e 100644
--- a/components/drive/file_system/get_file_for_saving_operation.cc
+++ b/components/drive/chromeos/file_system/get_file_for_saving_operation.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/get_file_for_saving_operation.h"
+#include "components/drive/chromeos/file_system/get_file_for_saving_operation.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/file_system/create_file_operation.h"
+#include "components/drive/chromeos/file_system/download_operation.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
 #include "components/drive/event_logger.h"
-#include "components/drive/file_cache.h"
-#include "components/drive/file_system/create_file_operation.h"
-#include "components/drive/file_system/download_operation.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/file_write_watcher.h"
 #include "components/drive/job_scheduler.h"
 
diff --git a/components/drive/file_system/get_file_for_saving_operation.h b/components/drive/chromeos/file_system/get_file_for_saving_operation.h
index 6bdfa70..3efbe84 100644
--- a/components/drive/file_system/get_file_for_saving_operation.h
+++ b/components/drive/chromeos/file_system/get_file_for_saving_operation.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_GET_FILE_FOR_SAVING_OPERATION_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_GET_FILE_FOR_SAVING_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_GET_FILE_FOR_SAVING_OPERATION_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_GET_FILE_FOR_SAVING_OPERATION_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system_interface.h"
 
 namespace base {
 class FilePath;
@@ -106,4 +106,4 @@ class GetFileForSavingOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_GET_FILE_FOR_SAVING_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_GET_FILE_FOR_SAVING_OPERATION_H_
diff --git a/components/drive/file_system/get_file_for_saving_operation_unittest.cc b/components/drive/chromeos/file_system/get_file_for_saving_operation_unittest.cc
index 7cfb731..996ac8e 100644
--- a/components/drive/file_system/get_file_for_saving_operation_unittest.cc
+++ b/components/drive/chromeos/file_system/get_file_for_saving_operation_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/get_file_for_saving_operation.h"
+#include "components/drive/chromeos/file_system/get_file_for_saving_operation.h"
 
 #include <stdint.h>
 
@@ -11,10 +11,10 @@
 #include "base/files/file_util.h"
 #include "base/run_loop.h"
 #include "base/task_runner_util.h"
+#include "components/drive/chromeos/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 "components/drive/file_system/operation_test_base.h"
 #include "components/drive/file_write_watcher.h"
 #include "components/drive/job_scheduler.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/components/drive/file_system/move_operation.cc b/components/drive/chromeos/file_system/move_operation.cc
index ff1edd6..5a39207 100644
--- a/components/drive/file_system/move_operation.cc
+++ b/components/drive/chromeos/file_system/move_operation.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/move_operation.h"
+#include "components/drive/chromeos/file_system/move_operation.h"
 
 #include "base/sequenced_task_runner.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.h"
 
 namespace drive {
 namespace file_system {
diff --git a/components/drive/file_system/move_operation.h b/components/drive/chromeos/file_system/move_operation.h
index 390f994..4881513 100644
--- a/components/drive/file_system/move_operation.h
+++ b/components/drive/chromeos/file_system/move_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_MOVE_OPERATION_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_MOVE_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_MOVE_OPERATION_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_MOVE_OPERATION_H_
 
 #include <set>
 
@@ -76,4 +76,4 @@ class MoveOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_MOVE_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_MOVE_OPERATION_H_
diff --git a/components/drive/file_system/move_operation_unittest.cc b/components/drive/chromeos/file_system/move_operation_unittest.cc
index 4f097b3..9cba9da 100644
--- a/components/drive/file_system/move_operation_unittest.cc
+++ b/components/drive/chromeos/file_system/move_operation_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/move_operation.h"
+#include "components/drive/chromeos/file_system/move_operation.h"
 
+#include "components/drive/chromeos/file_system/operation_test_base.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system/operation_test_base.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/drive/file_system/open_file_operation.cc b/components/drive/chromeos/file_system/open_file_operation.cc
index 54da778..fd759b9 100644
--- a/components/drive/file_system/open_file_operation.cc
+++ b/components/drive/chromeos/file_system/open_file_operation.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/open_file_operation.h"
+#include "components/drive/chromeos/file_system/open_file_operation.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ -11,12 +11,12 @@
 #include "base/logging.h"
 #include "base/task_runner_util.h"
 #include "base/thread_task_runner_handle.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/file_system/create_file_operation.h"
+#include "components/drive/chromeos/file_system/download_operation.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system/create_file_operation.h"
-#include "components/drive/file_system/download_operation.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/job_scheduler.h"
 
 namespace drive {
diff --git a/components/drive/file_system/open_file_operation.h b/components/drive/chromeos/file_system/open_file_operation.h
index fe8e9cf..7a3dc39 100644
--- a/components/drive/file_system/open_file_operation.h
+++ b/components/drive/chromeos/file_system/open_file_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_OPEN_FILE_OPERATION_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_OPEN_FILE_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_OPEN_FILE_OPERATION_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_OPEN_FILE_OPERATION_H_
 
 #include <map>
 
@@ -12,8 +12,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system_interface.h"
 
 namespace base {
 class FilePath;
@@ -106,4 +106,4 @@ class OpenFileOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_OPEN_FILE_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_OPEN_FILE_OPERATION_H_
diff --git a/components/drive/file_system/open_file_operation_unittest.cc b/components/drive/chromeos/file_system/open_file_operation_unittest.cc
index f3e503b..7068074 100644
--- a/components/drive/file_system/open_file_operation_unittest.cc
+++ b/components/drive/chromeos/file_system/open_file_operation_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/open_file_operation.h"
+#include "components/drive/chromeos/file_system/open_file_operation.h"
 
 #include <stdint.h>
 
@@ -12,11 +12,11 @@
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task_runner_util.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/file_system/operation_test_base.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system/operation_test_base.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/drive/file_system/operation_delegate.cc b/components/drive/chromeos/file_system/operation_delegate.cc
index f6e2dad..0570e4a 100644
--- a/components/drive/file_system/operation_delegate.cc
+++ b/components/drive/chromeos/file_system/operation_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/operation_delegate.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
 
 namespace drive {
 namespace file_system {
diff --git a/components/drive/file_system/operation_delegate.h b/components/drive/chromeos/file_system/operation_delegate.h
index ec1de18..ac6ec9a 100644
--- a/components/drive/file_system/operation_delegate.h
+++ b/components/drive/chromeos/file_system/operation_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_OPERATION_DELEGATE_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_OPERATION_DELEGATE_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_OPERATION_DELEGATE_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_OPERATION_DELEGATE_H_
 
 #include "components/drive/file_errors.h"
 
@@ -58,4 +58,4 @@ class OperationDelegate {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_OPERATION_DELEGATE_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_OPERATION_DELEGATE_H_
diff --git a/components/drive/file_system/operation_test_base.cc b/components/drive/chromeos/file_system/operation_test_base.cc
index 603aed4..d36bbb2 100644
--- a/components/drive/file_system/operation_test_base.cc
+++ b/components/drive/chromeos/file_system/operation_test_base.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/operation_test_base.h"
+#include "components/drive/chromeos/file_system/operation_test_base.h"
 
 #include "base/prefs/testing_pref_service.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "components/drive/change_list_loader.h"
+#include "components/drive/chromeos/change_list_loader.h"
+#include "components/drive/chromeos/fake_free_disk_space_getter.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/event_logger.h"
-#include "components/drive/fake_free_disk_space_getter.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "components/drive/service/test_util.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/components/drive/file_system/operation_test_base.h b/components/drive/chromeos/file_system/operation_test_base.h
index bfdece00..fe3c047 100644
--- a/components/drive/file_system/operation_test_base.h
+++ b/components/drive/chromeos/file_system/operation_test_base.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_OPERATION_TEST_BASE_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_OPERATION_TEST_BASE_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_OPERATION_TEST_BASE_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_OPERATION_TEST_BASE_H_
 
 #include <set>
 
 #include "base/files/scoped_temp_dir.h"
+#include "components/drive/chromeos/drive_test_util.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/drive_test_util.h"
 #include "components/drive/file_change.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -163,4 +163,4 @@ class OperationTestBase : public testing::Test {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_OPERATION_TEST_BASE_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_OPERATION_TEST_BASE_H_
diff --git a/components/drive/file_system/remove_operation.cc b/components/drive/chromeos/file_system/remove_operation.cc
index 9cfc56c..813f11e 100644
--- a/components/drive/file_system/remove_operation.cc
+++ b/components/drive/chromeos/file_system/remove_operation.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/remove_operation.h"
+#include "components/drive/chromeos/file_system/remove_operation.h"
 
 #include "base/sequenced_task_runner.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.h"
 
 namespace drive {
 namespace file_system {
diff --git a/components/drive/file_system/remove_operation.h b/components/drive/chromeos/file_system/remove_operation.h
index 651a0f3..f6ba4b7 100644
--- a/components/drive/file_system/remove_operation.h
+++ b/components/drive/chromeos/file_system/remove_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_REMOVE_OPERATION_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_REMOVE_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_REMOVE_OPERATION_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_REMOVE_OPERATION_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ -74,4 +74,4 @@ class RemoveOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_REMOVE_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_REMOVE_OPERATION_H_
diff --git a/components/drive/file_system/remove_operation_unittest.cc b/components/drive/chromeos/file_system/remove_operation_unittest.cc
index 5401275..2a616418 100644
--- a/components/drive/file_system/remove_operation_unittest.cc
+++ b/components/drive/chromeos/file_system/remove_operation_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/remove_operation.h"
+#include "components/drive/chromeos/file_system/remove_operation.h"
 
+#include "components/drive/chromeos/file_system/operation_test_base.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system/operation_test_base.h"
 #include "components/drive/file_system_core_util.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/test_util.h"
diff --git a/components/drive/file_system/search_operation.cc b/components/drive/chromeos/file_system/search_operation.cc
index 31e8437..b5608bc 100644
--- a/components/drive/file_system/search_operation.cc
+++ b/components/drive/chromeos/file_system/search_operation.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/search_operation.h"
+#include "components/drive/chromeos/file_system/search_operation.h"
 
 #include <stddef.h>
 #include <string>
@@ -13,12 +13,12 @@
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/task_runner_util.h"
-#include "components/drive/change_list_loader.h"
+#include "components/drive/chromeos/change_list_loader.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive_api_util.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_entry_conversion.h"
-#include "components/drive/resource_metadata.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "url/gurl.h"
 
diff --git a/components/drive/file_system/search_operation.h b/components/drive/chromeos/file_system/search_operation.h
index c871df7..b2441f0 100644
--- a/components/drive/file_system/search_operation.h
+++ b/components/drive/chromeos/file_system/search_operation.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_SEARCH_OPERATION_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_SEARCH_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_SEARCH_OPERATION_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_SEARCH_OPERATION_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
+#include "components/drive/chromeos/file_system_interface.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system_interface.h"
 #include "google_apis/drive/drive_api_error_codes.h"
 
 namespace base {
@@ -83,4 +83,4 @@ class SearchOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_SEARCH_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_SEARCH_OPERATION_H_
diff --git a/components/drive/file_system/search_operation_unittest.cc b/components/drive/chromeos/file_system/search_operation_unittest.cc
index 474c7df..1226ba9 100644
--- a/components/drive/file_system/search_operation_unittest.cc
+++ b/components/drive/chromeos/file_system/search_operation_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/search_operation.h"
+#include "components/drive/chromeos/file_system/search_operation.h"
 
 #include <stddef.h>
 
 #include "base/callback_helpers.h"
-#include "components/drive/change_list_loader.h"
-#include "components/drive/file_system/operation_test_base.h"
+#include "components/drive/chromeos/change_list_loader.h"
+#include "components/drive/chromeos/file_system/operation_test_base.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/drive_api_parser.h"
diff --git a/components/drive/file_system/set_property_operation.cc b/components/drive/chromeos/file_system/set_property_operation.cc
index 0620f2e..72387b9 100644
--- a/components/drive/file_system/set_property_operation.cc
+++ b/components/drive/chromeos/file_system/set_property_operation.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/set_property_operation.h"
+#include "components/drive/chromeos/file_system/set_property_operation.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/sequenced_task_runner.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.h"
 
 namespace drive {
 namespace file_system {
diff --git a/components/drive/file_system/set_property_operation.h b/components/drive/chromeos/file_system/set_property_operation.h
index 2e04441..41fd8fd 100644
--- a/components/drive/file_system/set_property_operation.h
+++ b/components/drive/chromeos/file_system/set_property_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_SET_PROPERTY_OPERATION_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_SET_PROPERTY_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_SET_PROPERTY_OPERATION_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_SET_PROPERTY_OPERATION_H_
 
 #include <string>
 
@@ -67,4 +67,4 @@ class SetPropertyOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_SET_PROPERTY_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_SET_PROPERTY_OPERATION_H_
diff --git a/components/drive/file_system/set_property_operation_unittest.cc b/components/drive/chromeos/file_system/set_property_operation_unittest.cc
index 093fbb2..259ed8a 100644
--- a/components/drive/file_system/set_property_operation_unittest.cc
+++ b/components/drive/chromeos/file_system/set_property_operation_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/set_property_operation.h"
+#include "components/drive/chromeos/file_system/set_property_operation.h"
 
 #include "base/files/file_path.h"
+#include "components/drive/chromeos/file_system/operation_test_base.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system/operation_test_base.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/drive_api_requests.h"
 #include "google_apis/drive/test_util.h"
diff --git a/components/drive/file_system/touch_operation.cc b/components/drive/chromeos/file_system/touch_operation.cc
index 63272d7..685fff7 100644
--- a/components/drive/file_system/touch_operation.cc
+++ b/components/drive/chromeos/file_system/touch_operation.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/touch_operation.h"
+#include "components/drive/chromeos/file_system/touch_operation.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/sequenced_task_runner.h"
 #include "base/time/time.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/file_change.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.h"
 
 namespace drive {
 namespace file_system {
diff --git a/components/drive/file_system/touch_operation.h b/components/drive/chromeos/file_system/touch_operation.h
index 46c53e7..c67bf76 100644
--- a/components/drive/file_system/touch_operation.h
+++ b/components/drive/chromeos/file_system/touch_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_TOUCH_OPERATION_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_TOUCH_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_TOUCH_OPERATION_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_TOUCH_OPERATION_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ -65,4 +65,4 @@ class TouchOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_TOUCH_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_TOUCH_OPERATION_H_
diff --git a/components/drive/file_system/touch_operation_unittest.cc b/components/drive/chromeos/file_system/touch_operation_unittest.cc
index c7b9cfe..ea4b0e5 100644
--- a/components/drive/file_system/touch_operation_unittest.cc
+++ b/components/drive/chromeos/file_system/touch_operation_unittest.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/touch_operation.h"
+#include "components/drive/chromeos/file_system/touch_operation.h"
 
 #include "base/files/file_path.h"
 #include "base/time/time.h"
+#include "components/drive/chromeos/file_system/operation_test_base.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system/operation_test_base.h"
-#include "components/drive/resource_metadata.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/drive/file_system/truncate_operation.cc b/components/drive/chromeos/file_system/truncate_operation.cc
index 0ccfdfc..bcb574d 100644
--- a/components/drive/file_system/truncate_operation.cc
+++ b/components/drive/chromeos/file_system/truncate_operation.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/truncate_operation.h"
+#include "components/drive/chromeos/file_system/truncate_operation.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ -12,11 +12,11 @@
 #include "base/sequenced_task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/thread_task_runner_handle.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/file_system/download_operation.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system/download_operation.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/job_scheduler.h"
 
 namespace drive {
diff --git a/components/drive/file_system/truncate_operation.h b/components/drive/chromeos/file_system/truncate_operation.h
index 42544a6..127d412 100644
--- a/components/drive/file_system/truncate_operation.h
+++ b/components/drive/chromeos/file_system/truncate_operation.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_TRUNCATE_OPERATION_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_TRUNCATE_OPERATION_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_TRUNCATE_OPERATION_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_TRUNCATE_OPERATION_H_
 
 #include <stdint.h>
 
@@ -88,4 +88,4 @@ class TruncateOperation {
 }  // namespace file_system
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_TRUNCATE_OPERATION_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_TRUNCATE_OPERATION_H_
diff --git a/components/drive/file_system/truncate_operation_unittest.cc b/components/drive/chromeos/file_system/truncate_operation_unittest.cc
index 7f4a45a..59d1dff 100644
--- a/components/drive/file_system/truncate_operation_unittest.cc
+++ b/components/drive/chromeos/file_system/truncate_operation_unittest.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system/truncate_operation.h"
+#include "components/drive/chromeos/file_system/truncate_operation.h"
 
 #include <stdint.h>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/task_runner_util.h"
+#include "components/drive/chromeos/fake_free_disk_space_getter.h"
+#include "components/drive/chromeos/file_system/operation_test_base.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/fake_free_disk_space_getter.h"
-#include "components/drive/file_system/operation_test_base.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/drive/file_system_interface.cc b/components/drive/chromeos/file_system_interface.cc
index 931b680..9ff6365 100644
--- a/components/drive/file_system_interface.cc
+++ b/components/drive/chromeos/file_system_interface.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/file_system_interface.h"
+#include "components/drive/chromeos/file_system_interface.h"
 
 namespace drive {
 
diff --git a/components/drive/file_system_interface.h b/components/drive/chromeos/file_system_interface.h
index 2fb43b9..fd79ea0 100644
--- a/components/drive/file_system_interface.h
+++ b/components/drive/chromeos/file_system_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_INTERFACE_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_INTERFACE_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_INTERFACE_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_INTERFACE_H_
 
 #include <stdint.h>
 
@@ -11,9 +11,9 @@
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_system_metadata.h"
-#include "components/drive/resource_metadata.h"
 #include "google_apis/drive/base_requests.h"
 #include "google_apis/drive/drive_api_requests.h"
 
@@ -473,4 +473,4 @@ class FileSystemInterface {
 
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_INTERFACE_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_INTERFACE_H_
diff --git a/components/drive/file_system_observer.h b/components/drive/chromeos/file_system_observer.h
index cf0d141..7b9379f 100644
--- a/components/drive/file_system_observer.h
+++ b/components/drive/chromeos/file_system_observer.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_OBSERVER_H_
-#define COMPONENTS_DRIVE_FILE_SYSTEM_OBSERVER_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_OBSERVER_H_
+#define COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_OBSERVER_H_
 
+#include "components/drive/chromeos/file_system/operation_delegate.h"
 #include "components/drive/file_errors.h"
-#include "components/drive/file_system/operation_delegate.h"
 
 namespace base {
 class FilePath;
@@ -38,4 +38,4 @@ class FileSystemObserver {
 
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_OBSERVER_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_FILE_SYSTEM_OBSERVER_H_
diff --git a/components/drive/file_system_unittest.cc b/components/drive/chromeos/file_system_unittest.cc
index 354c3e4..8d4150b 100644
--- a/components/drive/file_system_unittest.cc
+++ b/components/drive/chromeos/file_system_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 "components/drive/file_system.h"
+#include "components/drive/chromeos/file_system.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -20,19 +20,19 @@
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
-#include "components/drive/change_list_loader.h"
+#include "components/drive/chromeos/change_list_loader.h"
+#include "components/drive/chromeos/drive_test_util.h"
+#include "components/drive/chromeos/fake_free_disk_space_getter.h"
+#include "components/drive/chromeos/file_system_observer.h"
+#include "components/drive/chromeos/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/fake_free_disk_space_getter.h"
 #include "components/drive/file_change.h"
 #include "components/drive/file_system_core_util.h"
-#include "components/drive/file_system_observer.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "components/drive/service/test_util.h"
-#include "components/drive/sync_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/drive/drive_api_parser.h"
diff --git a/components/drive/remove_stale_cache_files.cc b/components/drive/chromeos/remove_stale_cache_files.cc
index 93cab01..dca7d31 100644
--- a/components/drive/remove_stale_cache_files.cc
+++ b/components/drive/chromeos/remove_stale_cache_files.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 "components/drive/remove_stale_cache_files.h"
+#include "components/drive/chromeos/remove_stale_cache_files.h"
 
 #include "base/logging.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/file_cache.h"
-#include "components/drive/resource_metadata.h"
 
 namespace drive {
 namespace internal {
diff --git a/components/drive/remove_stale_cache_files.h b/components/drive/chromeos/remove_stale_cache_files.h
index d3e922c..c7cf9bb 100644
--- a/components/drive/remove_stale_cache_files.h
+++ b/components/drive/chromeos/remove_stale_cache_files.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 COMPONENTS_DRIVE_REMOVE_STALE_CACHE_FILES_H_
-#define COMPONENTS_DRIVE_REMOVE_STALE_CACHE_FILES_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_REMOVE_STALE_CACHE_FILES_H_
+#define COMPONENTS_DRIVE_CHROMEOS_REMOVE_STALE_CACHE_FILES_H_
 
 namespace drive{
 namespace internal {
@@ -19,4 +19,4 @@ void RemoveStaleCacheFiles(FileCache* cache,
 }  // namespace internal
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_REMOVE_STALE_CACHE_FILES_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_REMOVE_STALE_CACHE_FILES_H_
diff --git a/components/drive/remove_stale_cache_files_unittest.cc b/components/drive/chromeos/remove_stale_cache_files_unittest.cc
index 4fa16e6..29ea04b 100644
--- a/components/drive/remove_stale_cache_files_unittest.cc
+++ b/components/drive/chromeos/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 "components/drive/chromeos/drive_test_util.h"
+#include "components/drive/chromeos/fake_free_disk_space_getter.h"
+#include "components/drive/chromeos/remove_stale_cache_files.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/drive_test_util.h"
-#include "components/drive/fake_free_disk_space_getter.h"
 #include "components/drive/file_system_core_util.h"
-#include "components/drive/remove_stale_cache_files.h"
-#include "components/drive/resource_metadata.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/components/drive/resource_metadata.cc b/components/drive/chromeos/resource_metadata.cc
index cbbc5ad..2a77db0 100644
--- a/components/drive/resource_metadata.cc
+++ b/components/drive/chromeos/resource_metadata.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/resource_metadata.h"
+#include "components/drive/chromeos/resource_metadata.h"
 
 #include <limits.h>
 #include <stddef.h>
@@ -15,8 +15,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
+#include "components/drive/chromeos/file_cache.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/resource_metadata_storage.h"
 
diff --git a/components/drive/resource_metadata.h b/components/drive/chromeos/resource_metadata.h
index 7260893..f08beea 100644
--- a/components/drive/resource_metadata.h
+++ b/components/drive/chromeos/resource_metadata.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_RESOURCE_METADATA_H_
-#define COMPONENTS_DRIVE_RESOURCE_METADATA_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_RESOURCE_METADATA_H_
+#define COMPONENTS_DRIVE_CHROMEOS_RESOURCE_METADATA_H_
 
 #include <stdint.h>
 
@@ -146,4 +146,4 @@ class ResourceMetadata {
 }  // namespace internal
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_RESOURCE_METADATA_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_RESOURCE_METADATA_H_
diff --git a/components/drive/resource_metadata_unittest.cc b/components/drive/chromeos/resource_metadata_unittest.cc
index 51299f2..3e1a371 100644
--- a/components/drive/resource_metadata_unittest.cc
+++ b/components/drive/chromeos/resource_metadata_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 "components/drive/resource_metadata.h"
+#include "components/drive/chromeos/resource_metadata.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -15,10 +15,10 @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
+#include "components/drive/chromeos/drive_test_util.h"
+#include "components/drive/chromeos/fake_free_disk_space_getter.h"
+#include "components/drive/chromeos/file_cache.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/drive_test_util.h"
-#include "components/drive/fake_free_disk_space_getter.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_system_core_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/drive/search_metadata.cc b/components/drive/chromeos/search_metadata.cc
index 5af854e6..61f734d 100644
--- a/components/drive/search_metadata.cc
+++ b/components/drive/chromeos/search_metadata.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/search_metadata.h"
+#include "components/drive/chromeos/search_metadata.h"
 
 #include <algorithm>
 #include <queue>
diff --git a/components/drive/search_metadata.h b/components/drive/chromeos/search_metadata.h
index e298daa..3a0a6cc 100644
--- a/components/drive/search_metadata.h
+++ b/components/drive/chromeos/search_metadata.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_DRIVE_SEARCH_METADATA_H_
-#define COMPONENTS_DRIVE_SEARCH_METADATA_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_SEARCH_METADATA_H_
+#define COMPONENTS_DRIVE_CHROMEOS_SEARCH_METADATA_H_
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/memory/scoped_vector.h"
-#include "components/drive/file_system_interface.h"
+#include "components/drive/chromeos/file_system_interface.h"
 
 namespace base {
 namespace i18n {
@@ -68,4 +68,4 @@ bool FindAndHighlight(
 }  // namespace internal
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_SEARCH_METADATA_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_SEARCH_METADATA_H_
diff --git a/components/drive/search_metadata_unittest.cc b/components/drive/chromeos/search_metadata_unittest.cc
index 9079482..e685327 100644
--- a/components/drive/search_metadata_unittest.cc
+++ b/components/drive/chromeos/search_metadata_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 "components/drive/search_metadata.h"
+#include "components/drive/chromeos/search_metadata.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -16,10 +16,10 @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
+#include "components/drive/chromeos/drive_test_util.h"
+#include "components/drive/chromeos/fake_free_disk_space_getter.h"
+#include "components/drive/chromeos/file_cache.h"
 #include "components/drive/drive_api_util.h"
-#include "components/drive/drive_test_util.h"
-#include "components/drive/fake_free_disk_space_getter.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_system_core_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/drive/sync/entry_revert_performer.cc b/components/drive/chromeos/sync/entry_revert_performer.cc
index 7b99737..72bda85 100644
--- a/components/drive/sync/entry_revert_performer.cc
+++ b/components/drive/chromeos/sync/entry_revert_performer.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/sync/entry_revert_performer.h"
+#include "components/drive/chromeos/sync/entry_revert_performer.h"
 
-#include "components/drive/change_list_processor.h"
+#include "components/drive/chromeos/change_list_processor.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_api_util.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_entry_conversion.h"
-#include "components/drive/resource_metadata.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 namespace drive {
diff --git a/components/drive/sync/entry_revert_performer.h b/components/drive/chromeos/sync/entry_revert_performer.h
index 17cfb83..d11f57e 100644
--- a/components/drive/sync/entry_revert_performer.h
+++ b/components/drive/chromeos/sync/entry_revert_performer.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 COMPONENTS_DRIVE_SYNC_ENTRY_REVERT_PERFORMER_H_
-#define COMPONENTS_DRIVE_SYNC_ENTRY_REVERT_PERFORMER_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_SYNC_ENTRY_REVERT_PERFORMER_H_
+#define COMPONENTS_DRIVE_CHROMEOS_SYNC_ENTRY_REVERT_PERFORMER_H_
 
 #include <set>
 
@@ -90,4 +90,4 @@ class EntryRevertPerformer {
 }  // namespace internal
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_SYNC_ENTRY_REVERT_PERFORMER_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_SYNC_ENTRY_REVERT_PERFORMER_H_
diff --git a/components/drive/sync/entry_revert_performer_unittest.cc b/components/drive/chromeos/sync/entry_revert_performer_unittest.cc
index 421749a..4dcfaa6 100644
--- a/components/drive/sync/entry_revert_performer_unittest.cc
+++ b/components/drive/chromeos/sync/entry_revert_performer_unittest.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/sync/entry_revert_performer.h"
+#include "components/drive/chromeos/sync/entry_revert_performer.h"
 
 #include "base/task_runner_util.h"
+#include "components/drive/chromeos/file_system/operation_test_base.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system/operation_test_base.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.h"
 #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/components/drive/sync/entry_update_performer.cc b/components/drive/chromeos/sync/entry_update_performer.cc
index 3367ebf..05d002e 100644
--- a/components/drive/sync/entry_update_performer.cc
+++ b/components/drive/chromeos/sync/entry_update_performer.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 "components/drive/sync/entry_update_performer.h"
+#include "components/drive/chromeos/sync/entry_update_performer.h"
 
 #include <stdint.h>
 
@@ -10,16 +10,16 @@
 
 #include "base/callback_helpers.h"
 #include "base/files/file_util.h"
-#include "components/drive/change_list_loader.h"
+#include "components/drive/chromeos/change_list_loader.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
+#include "components/drive/chromeos/resource_metadata.h"
+#include "components/drive/chromeos/sync/entry_revert_performer.h"
+#include "components/drive/chromeos/sync/remove_performer.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.h"
-#include "components/drive/sync/entry_revert_performer.h"
-#include "components/drive/sync/remove_performer.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 namespace drive {
diff --git a/components/drive/sync/entry_update_performer.h b/components/drive/chromeos/sync/entry_update_performer.h
index d319d0a..43bbf2e 100644
--- a/components/drive/sync/entry_update_performer.h
+++ b/components/drive/chromeos/sync/entry_update_performer.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 COMPONENTS_DRIVE_SYNC_ENTRY_UPDATE_PERFORMER_H_
-#define COMPONENTS_DRIVE_SYNC_ENTRY_UPDATE_PERFORMER_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_SYNC_ENTRY_UPDATE_PERFORMER_H_
+#define COMPONENTS_DRIVE_CHROMEOS_SYNC_ENTRY_UPDATE_PERFORMER_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ -103,4 +103,4 @@ class EntryUpdatePerformer {
 }  // namespace internal
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_SYNC_ENTRY_UPDATE_PERFORMER_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_SYNC_ENTRY_UPDATE_PERFORMER_H_
diff --git a/components/drive/sync/entry_update_performer_unittest.cc b/components/drive/chromeos/sync/entry_update_performer_unittest.cc
index dada25a..cf54b57 100644
--- a/components/drive/sync/entry_update_performer_unittest.cc
+++ b/components/drive/chromeos/sync/entry_update_performer_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 "components/drive/sync/entry_update_performer.h"
+#include "components/drive/chromeos/sync/entry_update_performer.h"
 
 #include <stdint.h>
 
@@ -10,12 +10,12 @@
 #include "base/files/file_util.h"
 #include "base/md5.h"
 #include "base/task_runner_util.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/file_system/download_operation.h"
+#include "components/drive/chromeos/file_system/operation_test_base.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive_api_util.h"
-#include "components/drive/file_cache.h"
-#include "components/drive/file_system/download_operation.h"
-#include "components/drive/file_system/operation_test_base.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.h"
 #include "components/drive/service/fake_drive_service.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/drive/drive_api_parser.h"
diff --git a/components/drive/sync/remove_performer.cc b/components/drive/chromeos/sync/remove_performer.cc
index 499f070..7a2c9a7 100644
--- a/components/drive/sync/remove_performer.cc
+++ b/components/drive/chromeos/sync/remove_performer.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/sync/remove_performer.h"
+#include "components/drive/chromeos/sync/remove_performer.h"
 
 #include "base/sequenced_task_runner.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
+#include "components/drive/chromeos/resource_metadata.h"
+#include "components/drive/chromeos/sync/entry_revert_performer.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_api_util.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_entry_conversion.h"
-#include "components/drive/resource_metadata.h"
-#include "components/drive/sync/entry_revert_performer.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 namespace drive {
diff --git a/components/drive/sync/remove_performer.h b/components/drive/chromeos/sync/remove_performer.h
index 913b454..41c760d 100644
--- a/components/drive/sync/remove_performer.h
+++ b/components/drive/chromeos/sync/remove_performer.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 COMPONENTS_DRIVE_SYNC_REMOVE_PERFORMER_H_
-#define COMPONENTS_DRIVE_SYNC_REMOVE_PERFORMER_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_SYNC_REMOVE_PERFORMER_H_
+#define COMPONENTS_DRIVE_CHROMEOS_SYNC_REMOVE_PERFORMER_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ -111,4 +111,4 @@ class RemovePerformer {
 }  // namespace internal
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_SYNC_REMOVE_PERFORMER_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_SYNC_REMOVE_PERFORMER_H_
diff --git a/components/drive/sync/remove_performer_unittest.cc b/components/drive/chromeos/sync/remove_performer_unittest.cc
index 7404d00..fb2982a 100644
--- a/components/drive/sync/remove_performer_unittest.cc
+++ b/components/drive/chromeos/sync/remove_performer_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/drive/sync/remove_performer.h"
+#include "components/drive/chromeos/sync/remove_performer.h"
 
 #include "base/task_runner_util.h"
-#include "components/drive/file_system/operation_test_base.h"
+#include "components/drive/chromeos/file_system/operation_test_base.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.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/components/drive/sync_client.cc b/components/drive/chromeos/sync_client.cc
index 3b71af3..159d997 100644
--- a/components/drive/sync_client.cc
+++ b/components/drive/chromeos/sync_client.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 "components/drive/sync_client.h"
+#include "components/drive/chromeos/sync_client.h"
 
 #include <stddef.h>
 
@@ -10,13 +10,13 @@
 
 #include "base/bind.h"
 #include "base/thread_task_runner_handle.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/file_system/download_operation.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
+#include "components/drive/chromeos/sync/entry_update_performer.h"
 #include "components/drive/drive.pb.h"
-#include "components/drive/file_cache.h"
-#include "components/drive/file_system/download_operation.h"
-#include "components/drive/file_system/operation_delegate.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/sync/entry_update_performer.h"
 #include "google_apis/drive/task_util.h"
 
 namespace drive {
diff --git a/components/drive/sync_client.h b/components/drive/chromeos/sync_client.h
index 67af6f1..de5c561 100644
--- a/components/drive/sync_client.h
+++ b/components/drive/chromeos/sync_client.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 COMPONENTS_DRIVE_SYNC_CLIENT_H_
-#define COMPONENTS_DRIVE_SYNC_CLIENT_H_
+#ifndef COMPONENTS_DRIVE_CHROMEOS_SYNC_CLIENT_H_
+#define COMPONENTS_DRIVE_CHROMEOS_SYNC_CLIENT_H_
 
 #include <map>
 #include <string>
@@ -15,9 +15,9 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
+#include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/file_errors.h"
 #include "components/drive/job_scheduler.h"
-#include "components/drive/resource_metadata.h"
 
 namespace base {
 class SequencedTaskRunner;
@@ -197,4 +197,4 @@ class SyncClient {
 }  // namespace internal
 }  // namespace drive
 
-#endif  // COMPONENTS_DRIVE_SYNC_CLIENT_H_
+#endif  // COMPONENTS_DRIVE_CHROMEOS_SYNC_CLIENT_H_
diff --git a/components/drive/sync_client_unittest.cc b/components/drive/chromeos/sync_client_unittest.cc
index 250b85d..8646827 100644
--- a/components/drive/sync_client_unittest.cc
+++ b/components/drive/chromeos/sync_client_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 "components/drive/sync_client.h"
+#include "components/drive/chromeos/sync_client.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ -13,20 +13,20 @@
 #include "base/single_thread_task_runner.h"
 #include "base/test/test_timeouts.h"
 #include "base/thread_task_runner_handle.h"
-#include "components/drive/change_list_loader.h"
+#include "components/drive/chromeos/change_list_loader.h"
+#include "components/drive/chromeos/drive_test_util.h"
+#include "components/drive/chromeos/fake_free_disk_space_getter.h"
+#include "components/drive/chromeos/file_cache.h"
+#include "components/drive/chromeos/file_system/move_operation.h"
+#include "components/drive/chromeos/file_system/operation_delegate.h"
+#include "components/drive/chromeos/file_system/remove_operation.h"
+#include "components/drive/chromeos/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/fake_free_disk_space_getter.h"
-#include "components/drive/file_cache.h"
 #include "components/drive/file_change.h"
-#include "components/drive/file_system/move_operation.h"
-#include "components/drive/file_system/operation_delegate.h"
-#include "components/drive/file_system/remove_operation.h"
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/job_scheduler.h"
 #include "components/drive/resource_entry_conversion.h"
-#include "components/drive/resource_metadata.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/components/drive/job_scheduler_unittest.cc b/components/drive/job_scheduler_unittest.cc
index a6e4f13..0d9da76 100644
--- a/components/drive/job_scheduler_unittest.cc
+++ b/components/drive/job_scheduler_unittest.cc
@@ -18,8 +18,8 @@
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
+#include "components/drive/chromeos/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/components/drive/local_file_reader_unittest.cc b/components/drive/local_file_reader_unittest.cc
index e8e040a..faddd75 100644
--- a/components/drive/local_file_reader_unittest.cc
+++ b/components/drive/local_file_reader_unittest.cc
@@ -16,7 +16,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/threading/thread.h"
-#include "components/drive/drive_test_util.h"
+#include "components/drive/chromeos/drive_test_util.h"
 #include "google_apis/drive/test_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/test_completion_callback.h"
diff --git a/components/drive/resource_metadata_storage_unittest.cc b/components/drive/resource_metadata_storage_unittest.cc
index 8d88bfc..4b8c04f 100644
--- a/components/drive/resource_metadata_storage_unittest.cc
+++ b/components/drive/resource_metadata_storage_unittest.cc
@@ -15,8 +15,8 @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_split.h"
 #include "base/thread_task_runner_handle.h"
+#include "components/drive/chromeos/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"