drive: Move DriveServiceInterface and friends to c/b/drive

These shouldn't be in 'google_apis' where only low level
network code should be placed.

BUG=244325
TEST=none
R=kinaba@chromium.org, kinuko@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207126 0039d316-1c4b-4281-b951-d872f2087c98

52 files changed, 100 insertions, 94 deletions

diff --git a/chrome/browser/chromeos/drive/change_list_loader_unittest.cc b/chrome/browser/chromeos/drive/change_list_loader_unittest.cc
index 2a9d5eb..39b6b3f 100644
--- a/chrome/browser/chromeos/drive/change_list_loader_unittest.cc
+++ b/chrome/browser/chromeos/drive/change_list_loader_unittest.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
diff --git a/chrome/browser/chromeos/drive/drive_app_registry_unittest.cc b/chrome/browser/chromeos/drive/drive_app_registry_unittest.cc
index 53bb03c..f8bea09 100644
--- a/chrome/browser/chromeos/drive/drive_app_registry_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_app_registry_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.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 e2abc38..72ade07 100644
--- a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc
@@ -17,7 +17,7 @@
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/local_file_reader.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/google_apis/task_util.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
diff --git a/chrome/browser/chromeos/drive/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc
index 139f17c..5788137 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service.cc
+++ b/chrome/browser/chromeos/drive/drive_integration_service.cc
@@ -21,12 +21,12 @@
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_util.h"
+#include "chrome/browser/drive/drive_api_service.h"
 #include "chrome/browser/drive/drive_notification_manager.h"
 #include "chrome/browser/drive/drive_notification_manager_factory.h"
+#include "chrome/browser/drive/gdata_wapi_service.h"
 #include "chrome/browser/google_apis/auth_service.h"
-#include "chrome/browser/google_apis/drive_api_service.h"
 #include "chrome/browser/google_apis/drive_api_util.h"
-#include "chrome/browser/google_apis/gdata_wapi_service.h"
 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_version_info.h"
diff --git a/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc b/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc
index f22adf5..d44281b 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_integration_service_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/chromeos/drive/dummy_file_system.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
-#include "chrome/browser/google_apis/dummy_drive_service.h"
+#include "chrome/browser/drive/dummy_drive_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc b/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc
index 6479c14..4093cc5 100644
--- a/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc
+++ b/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/chromeos/drive/fake_file_system.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/google_apis/task_util.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/chromeos/drive/fake_file_system.cc b/chrome/browser/chromeos/drive/fake_file_system.cc
index de7637f..701cf63 100644
--- a/chrome/browser/chromeos/drive/fake_file_system.cc
+++ b/chrome/browser/chromeos/drive/fake_file_system.cc
@@ -14,8 +14,8 @@
 #include "chrome/browser/chromeos/drive/file_errors.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "content/public/browser/browser_thread.h"
 
diff --git a/chrome/browser/chromeos/drive/fake_file_system_unittest.cc b/chrome/browser/chromeos/drive/fake_file_system_unittest.cc
index b34e31d..e344623 100644
--- a/chrome/browser/chromeos/drive/fake_file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/fake_file_system_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/file_util.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/drive/file_system.cc b/chrome/browser/chromeos/drive/file_system.cc
index 7b057a3..14f89bd 100644
--- a/chrome/browser/chromeos/drive/file_system.cc
+++ b/chrome/browser/chromeos/drive/file_system.cc
@@ -31,9 +31,9 @@
 #include "chrome/browser/chromeos/drive/remove_stale_cache_files.h"
 #include "chrome/browser/chromeos/drive/search_metadata.h"
 #include "chrome/browser/chromeos/drive/sync_client.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "chrome/browser/google_apis/drive_api_util.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc
index 970815c..5f1a905 100644
--- a/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/file_util.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc
index 5148dfc..5aee974 100644
--- a/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/download_operation_unittest.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.cc b/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
index b31d433..ab5d73c 100644
--- a/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
+++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc
index a140e2a..fdbbb78 100644
--- a/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/chromeos/drive/file_system/remove_operation.h"
 
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/drive/file_system/search_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/search_operation_unittest.cc
index fb52ba2..4ea9f33 100644
--- a/chrome/browser/chromeos/drive/file_system/search_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/search_operation_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/drive/file_system/update_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/update_operation_unittest.cc
index bb8b428..e7517ec 100644
--- a/chrome/browser/chromeos/drive/file_system/update_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/update_operation_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc b/chrome/browser/chromeos/drive/file_system_unittest.cc
index bf8007c9..6ad7ace 100644
--- a/chrome/browser/chromeos/drive/file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system_unittest.cc
@@ -24,8 +24,8 @@
 #include "chrome/browser/chromeos/drive/mock_directory_change_observer.h"
 #include "chrome/browser/chromeos/drive/sync_client.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
diff --git a/chrome/browser/chromeos/drive/file_task_executor.cc b/chrome/browser/chromeos/drive/file_task_executor.cc
index fb0e713..038ea5c 100644
--- a/chrome/browser/chromeos/drive/file_task_executor.cc
+++ b/chrome/browser/chromeos/drive/file_task_executor.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
diff --git a/chrome/browser/chromeos/drive/job_scheduler.h b/chrome/browser/chromeos/drive/job_scheduler.h
index 330cefe..6f229c8 100644
--- a/chrome/browser/chromeos/drive/job_scheduler.h
+++ b/chrome/browser/chromeos/drive/job_scheduler.h
@@ -13,7 +13,7 @@
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/job_list.h"
 #include "chrome/browser/chromeos/drive/job_queue.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/google_apis/drive_uploader.h"
 #include "net/base/network_change_notifier.h"
 
diff --git a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
index b1e9816..6bb720a 100644
--- a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
+++ b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
@@ -12,8 +12,8 @@
 #include "base/stl_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/chromeos/drive/sync_client_unittest.cc b/chrome/browser/chromeos/drive/sync_client_unittest.cc
index e3b5ef3..37ec8e2 100644
--- a/chrome/browser/chromeos/drive/sync_client_unittest.cc
+++ b/chrome/browser/chromeos/drive/sync_client_unittest.cc
@@ -18,7 +18,7 @@
 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
diff --git a/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc b/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc
index 1d7860e..48e8307 100644
--- a/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc
+++ b/chrome/browser/chromeos/drive/webkit_file_stream_reader_impl_unittest.cc
@@ -16,7 +16,7 @@
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/google_apis/time_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/base/io_buffer.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/external_filesystem_apitest.cc b/chrome/browser/chromeos/extensions/file_manager/external_filesystem_apitest.cc
index 86f18ea..7e76626 100644
--- a/chrome/browser/chromeos/extensions/file_manager/external_filesystem_apitest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/external_filesystem_apitest.cc
@@ -15,12 +15,12 @@
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system.h"
 #include "chrome/browser/chromeos/extensions/file_manager/drive_test_util.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "chrome/browser/google_apis/time_util.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc
index 1f10ede..db9d9ac 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc
@@ -18,10 +18,10 @@
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/extensions/file_manager/drive_test_util.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc
index 4b5ae23..c7499a7 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc
@@ -20,11 +20,11 @@
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/net/connectivity_state_helper.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
 #include "chrome/browser/google_apis/task_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.h b/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.h
index 135d7f9f..38e5340 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.h
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.h
@@ -14,7 +14,7 @@
 #include "chrome/browser/chromeos/drive/file_system_observer.h"
 #include "chrome/browser/chromeos/drive/job_list.h"
 #include "chrome/browser/chromeos/net/connectivity_state_helper_observer.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 #include "chromeos/disks/disk_mount_manager.h"
 
 class FileManagerNotifications;
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index f3507c1..d17df61 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -72,8 +72,8 @@
 #include "chrome/browser/chromeos/status/data_promo_notification.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/chromeos/system_key_event_listener.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud/cloud_policy_store.h"
diff --git a/chrome/browser/google_apis/drive_api_service.cc b/chrome/browser/drive/drive_api_service.cc
index 4d03ae0..9ece6a0 100644
--- a/chrome/browser/google_apis/drive_api_service.cc
+++ b/chrome/browser/drive/drive_api_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/google_apis/drive_api_service.h"
+#include "chrome/browser/drive/drive_api_service.h"
 
 #include <string>
 #include <vector>
diff --git a/chrome/browser/google_apis/drive_api_service.h b/chrome/browser/drive/drive_api_service.h
index aedb515..78b4d6d 100644
--- a/chrome/browser/google_apis/drive_api_service.h
+++ b/chrome/browser/drive/drive_api_service.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_SERVICE_H_
-#define CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_SERVICE_H_
+#ifndef CHROME_BROWSER_DRIVE_DRIVE_API_SERVICE_H_
+#define CHROME_BROWSER_DRIVE_DRIVE_API_SERVICE_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/google_apis/auth_service_observer.h"
 #include "chrome/browser/google_apis/drive_api_url_generator.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
 
 class GURL;
 class Profile;
@@ -173,4 +173,4 @@ class DriveAPIService : public DriveServiceInterface,
 
 }  // namespace google_apis
 
-#endif  // CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_SERVICE_H_
+#endif  // CHROME_BROWSER_DRIVE_DRIVE_API_SERVICE_H_
diff --git a/chrome/browser/google_apis/drive_service_interface.h b/chrome/browser/drive/drive_service_interface.h
index f80df60..6827fde 100644
--- a/chrome/browser/google_apis/drive_service_interface.h
+++ b/chrome/browser/drive/drive_service_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_GOOGLE_APIS_DRIVE_SERVICE_INTERFACE_H_
-#define CHROME_BROWSER_GOOGLE_APIS_DRIVE_SERVICE_INTERFACE_H_
+#ifndef CHROME_BROWSER_DRIVE_DRIVE_SERVICE_INTERFACE_H_
+#define CHROME_BROWSER_DRIVE_DRIVE_SERVICE_INTERFACE_H_
 
 #include <string>
 
@@ -372,4 +372,4 @@ class DriveServiceInterface {
 
 }  // namespace google_apis
 
-#endif  // CHROME_BROWSER_GOOGLE_APIS_DRIVE_SERVICE_INTERFACE_H_
+#endif  // CHROME_BROWSER_DRIVE_DRIVE_SERVICE_INTERFACE_H_
diff --git a/chrome/browser/google_apis/dummy_drive_service.cc b/chrome/browser/drive/dummy_drive_service.cc
index d775c20..7d2b70c 100644
--- a/chrome/browser/google_apis/dummy_drive_service.cc
+++ b/chrome/browser/drive/dummy_drive_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/google_apis/dummy_drive_service.h"
+#include "chrome/browser/drive/dummy_drive_service.h"
 
 namespace google_apis {
 
diff --git a/chrome/browser/google_apis/dummy_drive_service.h b/chrome/browser/drive/dummy_drive_service.h
index 0b6e9fb..cb535c4 100644
--- a/chrome/browser/google_apis/dummy_drive_service.h
+++ b/chrome/browser/drive/dummy_drive_service.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_GOOGLE_APIS_DUMMY_DRIVE_SERVICE_H_
-#define CHROME_BROWSER_GOOGLE_APIS_DUMMY_DRIVE_SERVICE_H_
+#ifndef CHROME_BROWSER_DRIVE_DUMMY_DRIVE_SERVICE_H_
+#define CHROME_BROWSER_DRIVE_DUMMY_DRIVE_SERVICE_H_
 
-#include "chrome/browser/google_apis/drive_service_interface.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 
 namespace google_apis {
 
@@ -133,4 +133,4 @@ class DummyDriveService : public DriveServiceInterface {
 
 }  // namespace google_apis
 
-#endif  // CHROME_BROWSER_GOOGLE_APIS_DUMMY_DRIVE_SERVICE_H_
+#endif  // CHROME_BROWSER_DRIVE_DUMMY_DRIVE_SERVICE_H_
diff --git a/chrome/browser/google_apis/fake_drive_service.cc b/chrome/browser/drive/fake_drive_service.cc
index 78dcbf9..47af7fd 100644
--- a/chrome/browser/google_apis/fake_drive_service.cc
+++ b/chrome/browser/drive/fake_drive_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/google_apis/fake_drive_service.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 
 #include <string>
 
diff --git a/chrome/browser/google_apis/fake_drive_service.h b/chrome/browser/drive/fake_drive_service.h
index 46ec3c9..ce9643e 100644
--- a/chrome/browser/google_apis/fake_drive_service.h
+++ b/chrome/browser/drive/fake_drive_service.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_GOOGLE_APIS_FAKE_DRIVE_SERVICE_H_
-#define CHROME_BROWSER_GOOGLE_APIS_FAKE_DRIVE_SERVICE_H_
+#ifndef CHROME_BROWSER_DRIVE_FAKE_DRIVE_SERVICE_H_
+#define CHROME_BROWSER_DRIVE_FAKE_DRIVE_SERVICE_H_
 
 #include "base/files/file_path.h"
 #include "base/values.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 
 namespace google_apis {
 
@@ -274,4 +274,4 @@ class FakeDriveService : public DriveServiceInterface {
 
 }  // namespace google_apis
 
-#endif  // CHROME_BROWSER_GOOGLE_APIS_FAKE_DRIVE_SERVICE_H_
+#endif  // CHROME_BROWSER_DRIVE_FAKE_DRIVE_SERVICE_H_
diff --git a/chrome/browser/google_apis/fake_drive_service_unittest.cc b/chrome/browser/drive/fake_drive_service_unittest.cc
index 6b4bddb..20bd5bf 100644
--- a/chrome/browser/google_apis/fake_drive_service_unittest.cc
+++ b/chrome/browser/drive/fake_drive_service_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/google_apis/fake_drive_service.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 
 #include <string>
 #include <vector>
diff --git a/chrome/browser/google_apis/gdata_wapi_service.cc b/chrome/browser/drive/gdata_wapi_service.cc
index e175928..db90f6f 100644
--- a/chrome/browser/google_apis/gdata_wapi_service.cc
+++ b/chrome/browser/drive/gdata_wapi_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/google_apis/gdata_wapi_service.h"
+#include "chrome/browser/drive/gdata_wapi_service.h"
 
 #include <string>
 #include <vector>
diff --git a/chrome/browser/google_apis/gdata_wapi_service.h b/chrome/browser/drive/gdata_wapi_service.h
index 48acfaf..af83a43 100644
--- a/chrome/browser/google_apis/gdata_wapi_service.h
+++ b/chrome/browser/drive/gdata_wapi_service.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_SERVICE_H_
-#define CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_SERVICE_H_
+#ifndef CHROME_BROWSER_DRIVE_GDATA_WAPI_SERVICE_H_
+#define CHROME_BROWSER_DRIVE_GDATA_WAPI_SERVICE_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/google_apis/auth_service_observer.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
 #include "chrome/browser/google_apis/gdata_wapi_requests.h"
 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h"
 
@@ -179,4 +179,4 @@ class GDataWapiService : public DriveServiceInterface,
 
 }  // namespace google_apis
 
-#endif  // CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_SERVICE_H_
+#endif  // CHROME_BROWSER_DRIVE_GDATA_WAPI_SERVICE_H_
diff --git a/chrome/browser/google_apis/mock_drive_service.cc b/chrome/browser/drive/mock_drive_service.cc
index 8df5223..0e94823 100644
--- a/chrome/browser/google_apis/mock_drive_service.cc
+++ b/chrome/browser/drive/mock_drive_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/google_apis/mock_drive_service.h"
+#include "chrome/browser/drive/mock_drive_service.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
diff --git a/chrome/browser/google_apis/mock_drive_service.h b/chrome/browser/drive/mock_drive_service.h
index 509df6e..01fada8 100644
--- a/chrome/browser/google_apis/mock_drive_service.h
+++ b/chrome/browser/drive/mock_drive_service.h
@@ -4,13 +4,13 @@
 
 // This file contains mocks for classes in drive_service_interface.h
 
-#ifndef CHROME_BROWSER_GOOGLE_APIS_MOCK_DRIVE_SERVICE_H_
-#define CHROME_BROWSER_GOOGLE_APIS_MOCK_DRIVE_SERVICE_H_
+#ifndef CHROME_BROWSER_DRIVE_MOCK_DRIVE_SERVICE_H_
+#define CHROME_BROWSER_DRIVE_MOCK_DRIVE_SERVICE_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace base {
@@ -215,4 +215,4 @@ class MockDriveService : public DriveServiceInterface {
 
 }  // namespace google_apis
 
-#endif  // CHROME_BROWSER_GOOGLE_APIS_MOCK_DRIVE_SERVICE_H_
+#endif  // CHROME_BROWSER_DRIVE_MOCK_DRIVE_SERVICE_H_
diff --git a/chrome/browser/google_apis/DEPS b/chrome/browser/google_apis/DEPS
index fb50475..c5a2f87 100644
--- a/chrome/browser/google_apis/DEPS
+++ b/chrome/browser/google_apis/DEPS
@@ -4,16 +4,8 @@ include_rules = [
   "+chrome/browser/google_apis",
 
   # Temporarily needed, see http://crbug.com/146989
-  "!chrome/browser/profiles/profile.h",
-  "!chrome/browser/signin/token_service_factory.h",
-  "!chrome/browser/signin/token_service.h",
-  "!chrome/common/chrome_notification_types.h",
+  "!chrome/browser/drive/drive_service_interface.h",
   "!content/public/browser/browser_thread.h",
-  "!content/public/browser/notification_details.h",
-  "!content/public/browser/notification_observer.h",
-  "!content/public/browser/notification_registrar.h",
-  "!content/public/browser/notification_source.h",
-  "!content/public/browser/notification_types.h",
 ]
 
 specific_include_rules = {
@@ -25,7 +17,21 @@ specific_include_rules = {
     "!content/public/test/test_browser_thread_bundle.h",
     "!content/public/test/test_utils.h",
   ],
-  "drive_uploader.cc": [
+  "auth_service\.(h|cc)": [
+    "!chrome/browser/profiles/profile.h",
+    "!chrome/browser/signin/token_service_factory.h",
+    "!chrome/browser/signin/token_service.h",
+    "!chrome/common/chrome_notification_types.h",
+    "!content/public/browser/notification_details.h",
+    "!content/public/browser/notification_observer.h",
+    "!content/public/browser/notification_registrar.h",
+    "!content/public/browser/notification_source.h",
+    "!content/public/browser/notification_types.h",
+  ],
+  "drive_uploader\.cc": [
     "!content/public/browser/power_save_blocker.h",
   ],
+  "drive_uploader_unittest\.cc": [
+    "!chrome/browser/drive/dummy_drive_service.h",
+  ],
 }
diff --git a/chrome/browser/google_apis/drive_api_requests.h b/chrome/browser/google_apis/drive_api_requests.h
index 277bb91..c4d3c9d 100644
--- a/chrome/browser/google_apis/drive_api_requests.h
+++ b/chrome/browser/google_apis/drive_api_requests.h
@@ -8,9 +8,9 @@
 #include <string>
 
 #include "base/callback_forward.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/google_apis/base_requests.h"
 #include "chrome/browser/google_apis/drive_api_url_generator.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
 
 namespace net {
 class URLRequestContextGetter;
diff --git a/chrome/browser/google_apis/drive_uploader.cc b/chrome/browser/google_apis/drive_uploader.cc
index 26c3969..bcc2ad2 100644
--- a/chrome/browser/google_apis/drive_uploader.cc
+++ b/chrome/browser/google_apis/drive_uploader.cc
@@ -12,7 +12,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/power_save_blocker.h"
diff --git a/chrome/browser/google_apis/drive_uploader.h b/chrome/browser/google_apis/drive_uploader.h
index 4337986..56e82c8 100644
--- a/chrome/browser/google_apis/drive_uploader.h
+++ b/chrome/browser/google_apis/drive_uploader.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 
diff --git a/chrome/browser/google_apis/drive_uploader_unittest.cc b/chrome/browser/google_apis/drive_uploader_unittest.cc
index 5d709d7..421d3da 100644
--- a/chrome/browser/google_apis/drive_uploader_unittest.cc
+++ b/chrome/browser/google_apis/drive_uploader_unittest.cc
@@ -15,7 +15,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
-#include "chrome/browser/google_apis/dummy_drive_service.h"
+#include "chrome/browser/drive/dummy_drive_service.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/google_apis/gdata_wapi_requests.h b/chrome/browser/google_apis/gdata_wapi_requests.h
index 6f0bb42..0ba75b6 100644
--- a/chrome/browser/google_apis/gdata_wapi_requests.h
+++ b/chrome/browser/google_apis/gdata_wapi_requests.h
@@ -8,8 +8,8 @@
 #include <string>
 #include <vector>
 
+#include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/google_apis/base_requests.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h"
 
 namespace net {
diff --git a/chrome/browser/sync_file_system/drive/api_util.cc b/chrome/browser/sync_file_system/drive/api_util.cc
index 61644a2..3a54d8d 100644
--- a/chrome/browser/sync_file_system/drive/api_util.cc
+++ b/chrome/browser/sync_file_system/drive/api_util.cc
@@ -12,11 +12,11 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/drive/drive_api_service.h"
+#include "chrome/browser/drive/gdata_wapi_service.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
-#include "chrome/browser/google_apis/drive_api_service.h"
 #include "chrome/browser/google_apis/drive_api_util.h"
 #include "chrome/browser/google_apis/drive_uploader.h"
-#include "chrome/browser/google_apis/gdata_wapi_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync_file_system/drive_file_sync_util.h"
 #include "chrome/browser/sync_file_system/logger.h"
diff --git a/chrome/browser/sync_file_system/drive/api_util.h b/chrome/browser/sync_file_system/drive/api_util.h
index 89b9c72..23359a0 100644
--- a/chrome/browser/sync_file_system/drive/api_util.h
+++ b/chrome/browser/sync_file_system/drive/api_util.h
@@ -9,8 +9,8 @@
 #include <string>
 
 #include "base/memory/weak_ptr.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/google_apis/drive_api_url_generator.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h"
 #include "chrome/browser/sync_file_system/drive/api_util_interface.h"
 #include "net/base/network_change_notifier.h"
diff --git a/chrome/browser/sync_file_system/drive/api_util_unittest.cc b/chrome/browser/sync_file_system/drive/api_util_unittest.cc
index ef49748..2a10ec0 100644
--- a/chrome/browser/sync_file_system/drive/api_util_unittest.cc
+++ b/chrome/browser/sync_file_system/drive/api_util_unittest.cc
@@ -9,9 +9,9 @@
 #include "base/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/values.h"
+#include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "chrome/browser/google_apis/drive_uploader.h"
-#include "chrome/browser/google_apis/fake_drive_service.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "chrome/browser/sync_file_system/drive_file_sync_util.h"
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service_mock_unittest.cc b/chrome/browser/sync_file_system/drive_file_sync_service_mock_unittest.cc
index dc76fbc..e282d01 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service_mock_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service_mock_unittest.cc
@@ -9,13 +9,13 @@
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
+#include "chrome/browser/drive/mock_drive_service.h"
 #include "chrome/browser/extensions/test_extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "chrome/browser/google_apis/drive_uploader.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
-#include "chrome/browser/google_apis/mock_drive_service.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "chrome/browser/sync_file_system/drive/api_util.h"
 #include "chrome/browser/sync_file_system/drive_file_sync_util.h"
diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
index f0d9d49..0ef48ea 100644
--- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
@@ -24,10 +24,10 @@
 #include "chrome/browser/chromeos/drive/logging.h"
 #include "chrome/browser/drive/drive_notification_manager.h"
 #include "chrome/browser/drive/drive_notification_manager_factory.h"
+#include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/google_apis/auth_service.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "chrome/browser/google_apis/drive_api_util.h"
-#include "chrome/browser/google_apis/drive_service_interface.h"
 #include "chrome/browser/google_apis/drive_switches.h"
 #include "chrome/browser/google_apis/event_logger.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index d3e9af4..087f4f2 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -508,10 +508,15 @@
         'browser/download/all_download_item_notifier.h',
         'browser/download/save_package_file_picker.cc',
         'browser/download/save_package_file_picker.h',
-        'browser/drive/drive_notification_manager_factory.cc',
-        'browser/drive/drive_notification_manager_factory.h',
+        'browser/drive/drive_api_service.cc',
+        'browser/drive/drive_api_service.h',
         'browser/drive/drive_notification_manager.cc',
         'browser/drive/drive_notification_manager.h',
+        'browser/drive/drive_notification_manager_factory.cc',
+        'browser/drive/drive_notification_manager_factory.h',
+        'browser/drive/drive_service_interface.h',
+        'browser/drive/gdata_wapi_service.cc',
+        'browser/drive/gdata_wapi_service.h',
         'browser/enumerate_modules_model_win.cc',
         'browser/enumerate_modules_model_win.h',
         'browser/extensions/scoped_gaia_auth_extension.cc',
@@ -622,15 +627,12 @@
         'browser/google_apis/drive_api_parser.h',
         'browser/google_apis/drive_api_requests.cc',
         'browser/google_apis/drive_api_requests.h',
-        'browser/google_apis/drive_api_service.cc',
-        'browser/google_apis/drive_api_service.h',
         'browser/google_apis/drive_api_url_generator.cc',
         'browser/google_apis/drive_api_url_generator.h',
         'browser/google_apis/drive_api_util.cc',
         'browser/google_apis/drive_api_util.h',
         'browser/google_apis/drive_entry_kinds.h',
         'browser/google_apis/drive_notification_observer.h',
-        'browser/google_apis/drive_service_interface.h',
         'browser/google_apis/drive_switches.cc',
         'browser/google_apis/drive_switches.h',
         'browser/google_apis/drive_uploader.cc',
@@ -645,8 +647,6 @@
         'browser/google_apis/gdata_wapi_requests.h',
         'browser/google_apis/gdata_wapi_parser.cc',
         'browser/google_apis/gdata_wapi_parser.h',
-        'browser/google_apis/gdata_wapi_service.cc',
-        'browser/google_apis/gdata_wapi_service.h',
         'browser/google_apis/gdata_wapi_url_generator.cc',
         'browser/google_apis/gdata_wapi_url_generator.h',
         'browser/google_apis/request_registry.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index a6e7951..c18bbd0 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1284,6 +1284,8 @@
         'browser/download/download_browsertest.cc',
         'browser/download/download_danger_prompt_browsertest.cc',
         'browser/download/save_page_browsertest.cc',
+        'browser/drive/fake_drive_service.cc',
+        'browser/drive/fake_drive_service.h',
         'browser/errorpage_browsertest.cc',
         'browser/extensions/active_tab_apitest.cc',
         'browser/extensions/activity_log/activity_log_browsertest.cc',
@@ -1448,8 +1450,6 @@
         'browser/first_run/try_chrome_dialog_view_browsertest.cc',
         'browser/geolocation/access_token_store_browsertest.cc',
         'browser/geolocation/geolocation_browsertest.cc',
-        'browser/google_apis/fake_drive_service.cc',
-        'browser/google_apis/fake_drive_service.h',
         'browser/history/history_browsertest.cc',
         'browser/history/multipart_browsertest.cc',
         'browser/history/redirect_browsertest.cc',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 063b719..fbedbd7 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -106,6 +106,12 @@
         'browser/download/download_test_file_activity_observer.h',
         'browser/download/test_download_shelf.cc',
         'browser/download/test_download_shelf.h',
+        'browser/drive/dummy_drive_service.cc',
+        'browser/drive/dummy_drive_service.h',
+        'browser/drive/mock_drive_service.cc',
+        'browser/drive/mock_drive_service.h',
+        'browser/drive/fake_drive_service.cc',
+        'browser/drive/fake_drive_service.h',
         'browser/extensions/api/messaging/native_messaging_test_util.cc',
         'browser/extensions/api/messaging/native_messaging_test_util.h',
         'browser/extensions/fake_safe_browsing_database_manager.cc',
@@ -124,8 +130,6 @@
         'browser/extensions/test_extension_system.h',
         'browser/extensions/test_management_policy.cc',
         'browser/extensions/test_management_policy.h',
-        'browser/google_apis/dummy_drive_service.cc',
-        'browser/google_apis/dummy_drive_service.h',
         'browser/google_apis/test_util.cc',
         'browser/google_apis/test_util.h',
         'browser/media_galleries/fileapi/picasa/pmp_test_helper.cc',
@@ -712,6 +716,7 @@
         'browser/download/download_status_updater_unittest.cc',
         'browser/download/download_target_determiner_unittest.cc',
         'browser/download/download_ui_controller_unittest.cc',
+        'browser/drive/fake_drive_service_unittest.cc',
         'browser/enumerate_modules_model_unittest_win.cc',
         'browser/extensions/active_tab_unittest.cc',
         'browser/extensions/activity_log/activity_database_unittest.cc',
@@ -858,11 +863,6 @@
         'browser/google_apis/gdata_wapi_parser_unittest.cc',
         'browser/google_apis/gdata_wapi_requests_unittest.cc',
         'browser/google_apis/gdata_wapi_url_generator_unittest.cc',
-        'browser/google_apis/fake_drive_service.cc',
-        'browser/google_apis/fake_drive_service.h',
-        'browser/google_apis/fake_drive_service_unittest.cc',
-        'browser/google_apis/mock_drive_service.cc',
-        'browser/google_apis/mock_drive_service.h',
         'browser/google_apis/request_util_unittest.cc',
         'browser/google_apis/time_util_unittest.cc',
         'browser/history/android/android_cache_database_unittest.cc',
@@ -2365,9 +2365,9 @@
             'browser/sessions/session_backend_unittest.cc',
 
             # Test files cannot be opened on Android.
+            'browser/drive/fake_drive_service_unittest.cc',
             'browser/google_apis/base_requests_server_unittest.cc',
             'browser/google_apis/drive_api_requests_unittest.cc',
-            'browser/google_apis/fake_drive_service_unittest.cc',
             'browser/google_apis/gdata_wapi_requests_unittest.cc',
             'browser/google_apis/gdata_wapi_parser_unittest.cc',