drive: Introduce chrome/browser/drive

This directory will contain utility code shared by SyncFileSystem
and Google Drive integration on Chrome OS. The shared utility code
has been placed in chrome/browser/google_apis, but it wasn't the
right place as c/b/google_apis was meant to contain low level code
for communicating with the Google API servers. This is why we had
lots of exceptions in c/b/google_apis/DEPS. These exceptions will
be all gone once the move is complete.

Move DriveNotificationManager as a first step.

BUG=244325
TEST=none

Review URL: https://chromiumcodereview.appspot.com/17137003

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

14 files changed, 30 insertions, 28 deletions

diff --git a/chrome/browser/chromeos/drive/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc
index 6f55aed..139f17c 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service.cc
+++ b/chrome/browser/chromeos/drive/drive_integration_service.cc
@@ -21,11 +21,11 @@
 #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_notification_manager.h"
+#include "chrome/browser/drive/drive_notification_manager_factory.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/drive_notification_manager.h"
-#include "chrome/browser/google_apis/drive_notification_manager_factory.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"
diff --git a/chrome/browser/drive/OWNERS b/chrome/browser/drive/OWNERS
new file mode 100644
index 0000000..3db88c0
--- /dev/null
+++ b/chrome/browser/drive/OWNERS
@@ -0,0 +1,5 @@
+hashimoto@chromium.org
+hidehiko@chromium.org
+kinaba@chromium.org
+satorux@chromium.org
+yoshiki@chromium.org
diff --git a/chrome/browser/drive/README b/chrome/browser/drive/README
new file mode 100644
index 0000000..beaedae
--- /dev/null
+++ b/chrome/browser/drive/README
@@ -0,0 +1,3 @@
+This directory contains utility code for accessing Google Drive, shared by
+SyncFileSystem (chrome/browser/sync_file_system) and Google Drive integration
+on Chrome OS (chrome/browser/chromeos/drive).
diff --git a/chrome/browser/google_apis/drive_notification_manager.cc b/chrome/browser/drive/drive_notification_manager.cc
index b974473..7979715 100644
--- a/chrome/browser/google_apis/drive_notification_manager.cc
+++ b/chrome/browser/drive/drive_notification_manager.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_notification_manager.h"
+#include "chrome/browser/drive/drive_notification_manager.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/google_apis/drive_notification_observer.h"
diff --git a/chrome/browser/google_apis/drive_notification_manager.h b/chrome/browser/drive/drive_notification_manager.h
index b2b9109..007709a 100644
--- a/chrome/browser/google_apis/drive_notification_manager.h
+++ b/chrome/browser/drive/drive_notification_manager.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_NOTIFICATION_MANAGER_H_
-#define CHROME_BROWSER_GOOGLE_APIS_DRIVE_NOTIFICATION_MANAGER_H_
+#ifndef CHROME_BROWSER_DRIVE_DRIVE_NOTIFICATION_MANAGER_H_
+#define CHROME_BROWSER_DRIVE_DRIVE_NOTIFICATION_MANAGER_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
@@ -92,4 +92,4 @@ class DriveNotificationManager
 
 }  // namespace google_apis
 
-#endif  // CHROME_BROWSER_GOOGLE_APIS_DRIVE_NOTIFICATION_MANAGER_H_
+#endif  // CHROME_BROWSER_DRIVE_DRIVE_NOTIFICATION_MANAGER_H_
diff --git a/chrome/browser/google_apis/drive_notification_manager_factory.cc b/chrome/browser/drive/drive_notification_manager_factory.cc
index 9c28800..cebea28 100644
--- a/chrome/browser/google_apis/drive_notification_manager_factory.cc
+++ b/chrome/browser/drive/drive_notification_manager_factory.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/google_apis/drive_notification_manager_factory.h"
+#include "chrome/browser/drive/drive_notification_manager_factory.h"
 
-#include "chrome/browser/google_apis/drive_notification_manager.h"
+#include "chrome/browser/drive/drive_notification_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
diff --git a/chrome/browser/google_apis/drive_notification_manager_factory.h b/chrome/browser/drive/drive_notification_manager_factory.h
index 6c1bddf..b273577 100644
--- a/chrome/browser/google_apis/drive_notification_manager_factory.h
+++ b/chrome/browser/drive/drive_notification_manager_factory.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_NOTIFICATION_MANAGER_FACTORY_H_
-#define CHROME_BROWSER_GOOGLE_APIS_DRIVE_NOTIFICATION_MANAGER_FACTORY_H_
+#ifndef CHROME_BROWSER_DRIVE_DRIVE_NOTIFICATION_MANAGER_FACTORY_H_
+#define CHROME_BROWSER_DRIVE_DRIVE_NOTIFICATION_MANAGER_FACTORY_H_
 
 #include "base/memory/singleton.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h"
@@ -36,4 +36,4 @@ class DriveNotificationManagerFactory
 
 }  // namespace google_apis
 
-#endif  // CHROME_BROWSER_GOOGLE_APIS_DRIVE_NOTIFICATION_MANAGER_FACTORY_H_
+#endif  // CHROME_BROWSER_DRIVE_DRIVE_NOTIFICATION_MANAGER_FACTORY_H_
diff --git a/chrome/browser/google_apis/DEPS b/chrome/browser/google_apis/DEPS
index 5e9249c..7934512 100644
--- a/chrome/browser/google_apis/DEPS
+++ b/chrome/browser/google_apis/DEPS
@@ -7,8 +7,6 @@ include_rules = [
   "!chrome/browser/profiles/profile.h",
   "!chrome/browser/signin/token_service_factory.h",
   "!chrome/browser/signin/token_service.h",
-  "!chrome/browser/sync/profile_sync_service_factory.h",
-  "!chrome/browser/sync/profile_sync_service.h",
   "!chrome/common/chrome_notification_types.h",
   "!content/public/browser/browser_thread.h",
   "!content/public/browser/notification_details.h",
@@ -30,7 +28,4 @@ specific_include_rules = {
   "drive_uploader.cc": [
     "!content/public/browser/power_save_blocker.h",
   ],
-  "http_server.cc": [
-    "!content/public/test/test_utils.h",
-  ],
 }
diff --git a/chrome/browser/google_apis/OWNERS b/chrome/browser/google_apis/OWNERS
index 0753535..3db88c0 100644
--- a/chrome/browser/google_apis/OWNERS
+++ b/chrome/browser/google_apis/OWNERS
@@ -3,4 +3,3 @@ hidehiko@chromium.org
 kinaba@chromium.org
 satorux@chromium.org
 yoshiki@chromium.org
-zork@chromium.org
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_file_sync_service.cc
index 2e175f1..713a030 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc
@@ -15,11 +15,11 @@
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/drive/drive_notification_manager.h"
+#include "chrome/browser/drive/drive_notification_manager_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/google_apis/drive_api_util.h"
-#include "chrome/browser/google_apis/drive_notification_manager.h"
-#include "chrome/browser/google_apis/drive_notification_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync_file_system/conflict_resolution_policy.h"
 #include "chrome/browser/sync_file_system/drive/api_util.h"
diff --git a/chrome/browser/sync_file_system/sync_file_system_service_factory.cc b/chrome/browser/sync_file_system/sync_file_system_service_factory.cc
index a0c628f..f8885ea 100644
--- a/chrome/browser/sync_file_system/sync_file_system_service_factory.cc
+++ b/chrome/browser/sync_file_system/sync_file_system_service_factory.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"
 
 #include "base/command_line.h"
-#include "chrome/browser/google_apis/drive_notification_manager_factory.h"
+#include "chrome/browser/drive/drive_notification_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync_file_system/drive_file_sync_service.h"
diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
index f49cc5f..3bcc67a 100644
--- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
@@ -22,11 +22,11 @@
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/job_list.h"
 #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/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_notification_manager.h"
-#include "chrome/browser/google_apis/drive_notification_manager_factory.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"
diff --git a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc
index a177558..200d88c 100644
--- a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc
+++ b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc
@@ -7,9 +7,9 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/values.h"
+#include "chrome/browser/drive/drive_notification_manager.h"
+#include "chrome/browser/drive/drive_notification_manager_factory.h"
 #include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h"
-#include "chrome/browser/google_apis/drive_notification_manager.h"
-#include "chrome/browser/google_apis/drive_notification_manager_factory.h"
 #include "chrome/browser/google_apis/time_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync_file_system/logger.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index a30a9cd..099ff8a 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -508,6 +508,10 @@
         '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_notification_manager.cc',
+        'browser/drive/drive_notification_manager.h',
         'browser/enumerate_modules_model_win.cc',
         'browser/enumerate_modules_model_win.h',
         'browser/extensions/scoped_gaia_auth_extension.cc',
@@ -625,10 +629,6 @@
         '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_manager_factory.cc',
-        'browser/google_apis/drive_notification_manager_factory.h',
-        'browser/google_apis/drive_notification_manager.cc',
-        'browser/google_apis/drive_notification_manager.h',
         'browser/google_apis/drive_notification_observer.h',
         'browser/google_apis/drive_service_interface.h',
         'browser/google_apis/drive_switches.cc',