Move drive_api_service.cc/.h from chrome/browser/chromeos/drive to chrome/google_apis.

Move drive_api_service.cc/.h from chrome/browser/chromeos/drive to chrome/google_apis.


BUG=166375
TEST=None


Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=176057

[peria, 2013-01-09 04:52:00]

Satoru san,
would you take a look, please?
I will add another reviewer as an owner of chrome/ after your review.

[satorux1, 2013-01-09 05:24:13]

LGTM. Thanks!

[peria, 2013-01-09 05:47:55]

Hi Lei,
Would you take a look for gyp changes under chrome/ directory?

[Lei Zhang, 2013-01-09 06:42:25]

gypi files lgtm

[peria, 2013-01-09 07:46:18]

Satoru san,
PTAL

I missed to build binaries for cros environment, and fixed a namespace error
which was caused by the previous patch.

[satorux1, 2013-01-09 08:11:44]

LGTM

[commit-bot: I haz the power, 2013-01-09 08:28:24]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/peria@chromium.org/11824019/7001

[commit-bot: I haz the power, 2013-01-09 08:28:26]

Failed to apply patch for chrome/browser/google_apis/drive_api_service.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  A         chrome/browser/google_apis/drive_api_service.cc
  Copied chrome/browser/chromeos/drive/drive_api_service.cc ->
chrome/browser/google_apis/drive_api_service.cc
  patching file chrome/browser/google_apis/drive_api_service.cc
  Hunk #9 FAILED at 199.
  Hunk #10 FAILED at 242.
  Hunk #11 succeeded at 283 (offset 5 lines).
  Hunk #12 succeeded at 298 (offset 5 lines).
  Hunk #13 succeeded at 309 (offset 5 lines).
  Hunk #14 succeeded at 320 (offset 5 lines).
  Hunk #15 succeeded at 331 (offset 5 lines).
  Hunk #16 succeeded at 342 (offset 5 lines).
  Hunk #17 succeeded at 353 (offset 5 lines).
  Hunk #18 succeeded at 362 (offset 5 lines).
  Hunk #19 succeeded at 372 (offset 5 lines).
  Hunk #20 succeeded at 384 (offset 5 lines).
  Hunk #21 succeeded at 404 (offset 5 lines).
  Hunk #22 succeeded at 412 (offset 5 lines).
  2 out of 22 hunks FAILED -- saving rejects to file
chrome/browser/google_apis/drive_api_service.cc.rej

Patch:   NR 
chrome/browser/chromeos/drive/drive_api_service.cc->chrome/browser/google_apis/drive_api_service.cc
Index: chrome/browser/google_apis/drive_api_service.cc
diff --git a/chrome/browser/chromeos/drive/drive_api_service.cc
b/chrome/browser/google_apis/drive_api_service.cc
similarity index 63%
rename from chrome/browser/chromeos/drive/drive_api_service.cc
rename to chrome/browser/google_apis/drive_api_service.cc
index
27abaf1d3ea29446ff8a7b6fe38c0914346c3865..2972f590b980db5ba9fd90c267d28a37e2838126
100644
--- a/chrome/browser/chromeos/drive/drive_api_service.cc
+++ b/chrome/browser/google_apis/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/chromeos/drive/drive_api_service.h"
+#include "chrome/browser/google_apis/drive_api_service.h"
 
 #include <string>
 #include <vector>
@@ -21,7 +21,7 @@
 
 using content::BrowserThread;
 
-namespace drive {
+namespace google_apis {
 
 namespace {
 
@@ -32,29 +32,26 @@ const char kDriveAppsReadonlyScope[] =
 
 // Parses the JSON value into ResourceList and runs |callback|.
 void ParseResourceListAndRun(
-    const google_apis::GetResourceListCallback& callback,
-    google_apis::GDataErrorCode error,
+    const GetResourceListCallback& callback,
+    GDataErrorCode error,
     scoped_ptr<base::Value> value) {
   if (!value) {
-    callback.Run(error, scoped_ptr<google_apis::ResourceList>());
+    callback.Run(error, scoped_ptr<ResourceList>());
     return;
   }
 
   // TODO(satorux): Parse the JSON value on a blocking pool. crbug.com/165088
-  scoped_ptr<google_apis::ChangeList> change_list(
-      google_apis::ChangeList::CreateFrom(*value));
+  scoped_ptr<ChangeList> change_list(ChangeList::CreateFrom(*value));
   if (!change_list) {
-    callback.Run(google_apis::GDATA_PARSE_ERROR,
-                 scoped_ptr<google_apis::ResourceList>());
+    callback.Run(GDATA_PARSE_ERROR, scoped_ptr<ResourceList>());
     return;
   }
 
   // TODO(satorux): Do the conversion on a blocking pool too. crbug.com/165088
-  scoped_ptr<google_apis::ResourceList> resource_list =
-      google_apis::ResourceList::CreateFromChangeList(*change_list);
+  scoped_ptr<ResourceList> resource_list =
+      ResourceList::CreateFromChangeList(*change_list);
   if (!resource_list) {
-    callback.Run(google_apis::GDATA_PARSE_ERROR,
-                 scoped_ptr<google_apis::ResourceList>());
+    callback.Run(GDATA_PARSE_ERROR, scoped_ptr<ResourceList>());
     return;
   }
 
@@ -63,31 +60,28 @@ void ParseResourceListAndRun(
 
 // Parses the JSON value to ResourceEntry runs |callback|.
 void ParseResourceEntryAndRun(
-    const google_apis::GetResourceEntryCallback& callback,
-    google_apis::GDataErrorCode error,
+    const GetResourceEntryCallback& callback,
+    GDataErrorCode error,
     scoped_ptr<base::Value> value) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!value) {
-    callback.Run(error, scoped_ptr<google_apis::ResourceEntry>());
+    callback.Run(error, scoped_ptr<ResourceEntry>());
     return;
   }
 
   // Parsing FileResource is cheap enough to do on UI thread.
-  scoped_ptr<google_apis::FileResource> file_resource =
-      google_apis::FileResource::CreateFrom(*value);
+  scoped_ptr<FileResource> file_resource = FileResource::CreateFrom(*value);
   if (!file_resource) {
-    callback.Run(google_apis::GDATA_PARSE_ERROR,
-                 scoped_ptr<google_apis::ResourceEntry>());
+    callback.Run(GDATA_PARSE_ERROR, scoped_ptr<ResourceEntry>());
     return;
   }
 
   // Converting to ResourceEntry is cheap enough to do on UI thread.
-  scoped_ptr<google_apis::ResourceEntry> entry =
-      google_apis::ResourceEntry::CreateFromFileResource(*file_resource);
+  scoped_ptr<ResourceEntry> entry =
+      ResourceEntry::CreateFromFileResource(*file_resource);
   if (!entry) {
-    callback.Run(google_apis::GDATA_PARSE_ERROR,
-                 scoped_ptr<google_apis::ResourceEntry>());
+    callback.Run(GDATA_PARSE_ERROR, scoped_ptr<ResourceEntry>());
     return;
   }
 
@@ -97,25 +91,23 @@ void ParseResourceEntryAndRun(
 // Parses the JSON value to AccountMetadataFeed on the blocking pool and runs
 // |callback| on the UI thread once parsing is done.
 void ParseAccounetMetadataAndRun(
-    const google_apis::GetAccountMetadataCallback& callback,
-    google_apis::GDataErrorCode error,
+    const GetAccountMetadataCallback& callback,
+    GDataErrorCode error,
     scoped_ptr<base::Value> value) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (!value) {
-    callback.Run(error, scoped_ptr<google_apis::AccountMetadataFeed>());
+    callback.Run(error, scoped_ptr<AccountMetadataFeed>());
     return;
   }
 
   // Parsing AboutResource is cheap enough to do on UI thread.
-  scoped_ptr<google_apis::AboutResource> about_resource =
-      google_apis::AboutResource::CreateFrom(*value);
+  scoped_ptr<AboutResource> about_resource = AboutResource::CreateFrom(*value);
 
   // TODO(satorux): Convert AboutResource to AccountMetadataFeed.
   // For now just returning an error. crbug.com/165621
-  callback.Run(google_apis::GDATA_PARSE_ERROR,
-               scoped_ptr<google_apis::AccountMetadataFeed>());
+  callback.Run(GDATA_PARSE_ERROR, scoped_ptr<AccountMetadataFeed>());
 }
 
 }  // namespace
@@ -145,23 +137,21 @@ void DriveAPIService::Initialize(Profile* profile) {
   std::vector<std::string> scopes;
   scopes.push_back(kDriveScope);
   scopes.push_back(kDriveAppsReadonlyScope);
-  runner_.reset(
-      new google_apis::OperationRunner(profile,
-                                       url_request_context_getter_,
-                                       scopes,
-                                       custom_user_agent_));
+  runner_.reset(new OperationRunner(profile,
+                                    url_request_context_getter_,
+                                    scopes,
+                                    custom_user_agent_));
   runner_->Initialize();
 
   runner_->auth_service()->AddObserver(this);
   runner_->operation_registry()->AddObserver(this);
 }
 
-void DriveAPIService::AddObserver(google_apis::DriveServiceObserver* observer)
{
+void DriveAPIService::AddObserver(DriveServiceObserver* observer) {
   observers_.AddObserver(observer);
 }
 
-void DriveAPIService::RemoveObserver(
-    google_apis::DriveServiceObserver* observer) {
+void DriveAPIService::RemoveObserver(DriveServiceObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
@@ -181,8 +171,7 @@ bool DriveAPIService::CancelForFilePath(const FilePath&
file_path) {
   return operation_registry()->CancelForFilePath(file_path);
 }
 
-google_apis::OperationProgressStatusList
-DriveAPIService::GetProgressStatusList() const {
+OperationProgressStatusList DriveAPIService::GetProgressStatusList() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return operation_registry()->GetProgressStatusList();
 }
@@ -193,7 +182,7 @@ void DriveAPIService::GetResourceList(
     const std::string& search_query,
     bool shared_with_me,
     const std::string& directory_resource_id,
-    const google_apis::GetResourceListCallback& callback) {
+    const GetResourceListCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
@@ -210,42 +199,40 @@ void DriveAPIService::GetResourceList(
 void DriveAPIService::GetFilelist(
     const GURL& url,
     const std::string& search_query,
-    const google_apis::GetResourceListCallback& callback) {
+    const GetResourceListCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
-  runner_->StartOperationWithRetry(
-      new google_apis::GetFilelistOperation(
-          operation_registry(),
-          url_request_context_getter_,
-          url,
-          search_query,
-          base::Bind(&ParseResourceListAndRun, callback)));
+  runner_->StartOperationWithRetry(new GetFilelistOperation(
+      operation_registry(),
+      url_request_context_getter_,
+      url,
+      search_query,
+      base::Bind(&ParseResourceListAndRun, callback)));
 }
 
 void DriveAPIService::GetChangelist(
     const GURL& url,
     int64 start_changestamp,
-    const google_apis::GetResourceListCallback& callback) {
+    const GetResourceListCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
-  runner_->StartOperationWithRetry(
-      new google_apis::GetChangelistOperation(
-          operation_registry(),
-          url_request_context_getter_,
-          url,
-          start_changestamp,
-          base::Bind(&ParseResourceListAndRun, callback)));
+  runner_->StartOperationWithRetry(new GetChangelistOperation(
+      operation_regist…
(message too large)

[commit-bot: I haz the power, 2013-01-09 08:52:31]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/peria@chromium.org/11824019/3003

[commit-bot: I haz the power, 2013-01-09 11:46:01]

Retried try job too often on win_aura for step(s) content_browsertests

[commit-bot: I haz the power, 2013-01-10 02:26:23]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/peria@chromium.org/11824019/3003

[commit-bot: I haz the power, 2013-01-10 02:26:27]

Failed to apply patch for chrome/browser/google_apis/drive_api_service.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  A         chrome/browser/google_apis/drive_api_service.cc
  Copied chrome/browser/chromeos/drive/drive_api_service.cc ->
chrome/browser/google_apis/drive_api_service.cc
  patching file chrome/browser/google_apis/drive_api_service.cc
  Hunk #2 succeeded at 23 (offset 2 lines).
  Hunk #3 FAILED at 32.
  Hunk #4 succeeded at 92 (offset 29 lines).
  Hunk #5 succeeded at 123 (offset 29 lines).
  Hunk #6 succeeded at 171 (offset 31 lines).
  Hunk #7 succeeded at 205 (offset 31 lines).
  Hunk #8 succeeded at 216 (offset 31 lines).
  Hunk #9 FAILED at 202.
  Hunk #10 succeeded at 279 (offset 31 lines).
  Hunk #11 succeeded at 315 (offset 31 lines).
  Hunk #12 succeeded at 330 (offset 31 lines).
  Hunk #13 succeeded at 341 (offset 31 lines).
  Hunk #14 succeeded at 352 (offset 31 lines).
  Hunk #15 succeeded at 363 (offset 31 lines).
  Hunk #16 succeeded at 374 (offset 31 lines).
  Hunk #17 succeeded at 385 (offset 31 lines).
  Hunk #18 succeeded at 394 (offset 31 lines).
  Hunk #19 succeeded at 404 (offset 31 lines).
  Hunk #20 succeeded at 416 (offset 31 lines).
  Hunk #21 succeeded at 436 (offset 31 lines).
  Hunk #22 succeeded at 444 (offset 31 lines).
  2 out of 22 hunks FAILED -- saving rejects to file
chrome/browser/google_apis/drive_api_service.cc.rej

Patch:   NR 
chrome/browser/chromeos/drive/drive_api_service.cc->chrome/browser/google_apis/drive_api_service.cc
Index: chrome/browser/google_apis/drive_api_service.cc
diff --git a/chrome/browser/chromeos/drive/drive_api_service.cc
b/chrome/browser/google_apis/drive_api_service.cc
similarity index 64%
rename from chrome/browser/chromeos/drive/drive_api_service.cc
rename to chrome/browser/google_apis/drive_api_service.cc
index
18348fa2efd921fed6a9219ce22d96079c73fc53..8e034d1f1741303ee98d42946991cd99282ef58a
100644
--- a/chrome/browser/chromeos/drive/drive_api_service.cc
+++ b/chrome/browser/google_apis/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/chromeos/drive/drive_api_service.h"
+#include "chrome/browser/google_apis/drive_api_service.h"
 
 #include <string>
 #include <vector>
@@ -21,7 +21,7 @@
 
 using content::BrowserThread;
 
-namespace drive {
+namespace google_apis {
 
 namespace {
 
@@ -32,29 +32,26 @@ const char kDriveAppsReadonlyScope[] =
 
 // Parses the JSON value into ResourceList and runs |callback|.
 void ParseResourceListAndRun(
-    const google_apis::GetResourceListCallback& callback,
-    google_apis::GDataErrorCode error,
+    const GetResourceListCallback& callback,
+    GDataErrorCode error,
     scoped_ptr<base::Value> value) {
   if (!value) {
-    callback.Run(error, scoped_ptr<google_apis::ResourceList>());
+    callback.Run(error, scoped_ptr<ResourceList>());
     return;
   }
 
   // TODO(satorux): Parse the JSON value on a blocking pool. crbug.com/165088
-  scoped_ptr<google_apis::ChangeList> change_list(
-      google_apis::ChangeList::CreateFrom(*value));
+  scoped_ptr<ChangeList> change_list(ChangeList::CreateFrom(*value));
   if (!change_list) {
-    callback.Run(google_apis::GDATA_PARSE_ERROR,
-                 scoped_ptr<google_apis::ResourceList>());
+    callback.Run(GDATA_PARSE_ERROR, scoped_ptr<ResourceList>());
     return;
   }
 
   // TODO(satorux): Do the conversion on a blocking pool too. crbug.com/165088
-  scoped_ptr<google_apis::ResourceList> resource_list =
-      google_apis::ResourceList::CreateFromChangeList(*change_list);
+  scoped_ptr<ResourceList> resource_list =
+      ResourceList::CreateFromChangeList(*change_list);
   if (!resource_list) {
-    callback.Run(google_apis::GDATA_PARSE_ERROR,
-                 scoped_ptr<google_apis::ResourceList>());
+    callback.Run(GDATA_PARSE_ERROR, scoped_ptr<ResourceList>());
     return;
   }
 
@@ -63,31 +60,28 @@ void ParseResourceListAndRun(
 
 // Parses the JSON value to ResourceEntry runs |callback|.
 void ParseResourceEntryAndRun(
-    const google_apis::GetResourceEntryCallback& callback,
-    google_apis::GDataErrorCode error,
+    const GetResourceEntryCallback& callback,
+    GDataErrorCode error,
     scoped_ptr<base::Value> value) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!value) {
-    callback.Run(error, scoped_ptr<google_apis::ResourceEntry>());
+    callback.Run(error, scoped_ptr<ResourceEntry>());
     return;
   }
 
   // Parsing FileResource is cheap enough to do on UI thread.
-  scoped_ptr<google_apis::FileResource> file_resource =
-      google_apis::FileResource::CreateFrom(*value);
+  scoped_ptr<FileResource> file_resource = FileResource::CreateFrom(*value);
   if (!file_resource) {
-    callback.Run(google_apis::GDATA_PARSE_ERROR,
-                 scoped_ptr<google_apis::ResourceEntry>());
+    callback.Run(GDATA_PARSE_ERROR, scoped_ptr<ResourceEntry>());
     return;
   }
 
   // Converting to ResourceEntry is cheap enough to do on UI thread.
-  scoped_ptr<google_apis::ResourceEntry> entry =
-      google_apis::ResourceEntry::CreateFromFileResource(*file_resource);
+  scoped_ptr<ResourceEntry> entry =
+      ResourceEntry::CreateFromFileResource(*file_resource);
   if (!entry) {
-    callback.Run(google_apis::GDATA_PARSE_ERROR,
-                 scoped_ptr<google_apis::ResourceEntry>());
+    callback.Run(GDATA_PARSE_ERROR, scoped_ptr<ResourceEntry>());
     return;
   }
 
@@ -97,25 +91,23 @@ void ParseResourceEntryAndRun(
 // Parses the JSON value to AccountMetadataFeed on the blocking pool and runs
 // |callback| on the UI thread once parsing is done.
 void ParseAccounetMetadataAndRun(
-    const google_apis::GetAccountMetadataCallback& callback,
-    google_apis::GDataErrorCode error,
+    const GetAccountMetadataCallback& callback,
+    GDataErrorCode error,
     scoped_ptr<base::Value> value) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (!value) {
-    callback.Run(error, scoped_ptr<google_apis::AccountMetadataFeed>());
+    callback.Run(error, scoped_ptr<AccountMetadataFeed>());
     return;
   }
 
   // Parsing AboutResource is cheap enough to do on UI thread.
-  scoped_ptr<google_apis::AboutResource> about_resource =
-      google_apis::AboutResource::CreateFrom(*value);
+  scoped_ptr<AboutResource> about_resource = AboutResource::CreateFrom(*value);
 
   // TODO(satorux): Convert AboutResource to AccountMetadataFeed.
   // For now just returning an error. crbug.com/165621
-  callback.Run(google_apis::GDATA_PARSE_ERROR,
-               scoped_ptr<google_apis::AccountMetadataFeed>());
+  callback.Run(GDATA_PARSE_ERROR, scoped_ptr<AccountMetadataFeed>());
 }
 
 }  // namespace
@@ -145,23 +137,21 @@ void DriveAPIService::Initialize(Profile* profile) {
   std::vector<std::string> scopes;
   scopes.push_back(kDriveScope);
   scopes.push_back(kDriveAppsReadonlyScope);
-  runner_.reset(
-      new google_apis::OperationRunner(profile,
-                                       url_request_context_getter_,
-                                       scopes,
-                                       custom_user_agent_));
+  runner_.reset(new OperationRunner(profile,
+                                    url_request_context_getter_,
+                                    scopes,
+                                    custom_user_agent_));
   runner_->Initialize();
 
   runner_->auth_service()->AddObserver(this);
   runner_->operation_registry()->AddObserver(this);
 }
 
-void DriveAPIService::AddObserver(google_apis::DriveServiceObserver* observer)
{
+void DriveAPIService::AddObserver(DriveServiceObserver* observer) {
   observers_.AddObserver(observer);
 }
 
-void DriveAPIService::RemoveObserver(
-    google_apis::DriveServiceObserver* observer) {
+void DriveAPIService::RemoveObserver(DriveServiceObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
@@ -181,8 +171,7 @@ bool DriveAPIService::CancelForFilePath(const FilePath&
file_path) {
   return operation_registry()->CancelForFilePath(file_path);
 }
 
-google_apis::OperationProgressStatusList
-DriveAPIService::GetProgressStatusList() const {
+OperationProgressStatusList DriveAPIService::GetProgressStatusList() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return operation_registry()->GetProgressStatusList();
 }
@@ -193,7 +182,7 @@ void DriveAPIService::GetResourceList(
     const std::string& search_query,
     bool shared_with_me,
     const std::string& directory_resource_id,
-    const google_apis::GetResourceListCallback& callback) {
+    const GetResourceListCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
@@ -210,44 +199,42 @@ void DriveAPIService::GetResourceList(
 void DriveAPIService::GetFilelist(
     const GURL& url,
     const std::string& search_query,
-    const google_apis::GetResourceListCallback& callback) {
+    const GetResourceListCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
-  runner_->StartOperationWithRetry(
-      new google_apis::GetFilelistOperation(
-          operation_registry(),
-          url_request_context_getter_,
-          url_generator_,
-          url,
-          search_query,
-          base::Bind(&ParseResourceListAndRun, callback)));
+  runner_->StartOperationWithRetry(new GetFilelistOperation(
+      operation_registry(),
+      url_request_context_getter_,
+      url_generator_,
+      url,
+      search_query,
+      base::Bind(&ParseResourceListAndRun, callback)));
 }
 
 void DriveAPIService::GetChangelist(
     const GURL& url,
     int64 start_changestamp,
-    const google_apis::GetResourceListCallback& callback) {
+    const GetResourceListCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCH…
(message too large)

[commit-bot: I haz the power, 2013-01-10 03:55:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/peria@chromium.org/11824019/9005

[commit-bot: I haz the power, 2013-01-10 12:53:23]

Change committed as 176057