Move parsing code from gdata_wapi_service to gdata_wapi_operations.

chrome/browser/google_apis/gdata_wapi_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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 <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 87 matching lines @@
   scoped_ptr<ResourceEntry> entry =
       google_apis::ResourceEntry::ExtractAndParse(*value);
   if (!entry) {
     callback.Run(GDATA_PARSE_ERROR, scoped_ptr<ResourceEntry>());
     return;
   }
 
   callback.Run(error, entry.Pass());
 }
 
-// Extracts the open link url from the JSON Feed. Used by AuthorizeApp().
-void ExtractOpenLinkAndRun(const std::string app_id,
-                           const AuthorizeAppCallback& callback,
-                           GDataErrorCode error,
-                           scoped_ptr<ResourceEntry> entry) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  // Entry not found in the feed.
-  if (!entry) {
-    callback.Run(error, GURL());
-    return;
-  }
-
-  const ScopedVector<google_apis::Link>& resource_links = entry->links();
-  GURL open_link;
-  for (size_t i = 0; i < resource_links.size(); ++i) {
-    if (resource_links[i]->type() == google_apis::Link::LINK_OPEN_WITH &&
-        resource_links[i]->app_id() == app_id) {
-        open_link = resource_links[i]->href();
-        break;
-    }
-  }
-
-  callback.Run(error, open_link);
-}
-
 void ParseAboutResourceAndRun(
     const GetAboutResourceCallback& callback,
     GDataErrorCode error,
     scoped_ptr<AccountMetadata> account_metadata) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   scoped_ptr<AboutResource> about_resource;
   if (account_metadata) {
     about_resource = AboutResource::CreateFromAccountMetadata(
@@ skipping 390 matching lines @@
                                     const std::string& app_id,
                                     const AuthorizeAppCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   runner_->StartOperationWithRetry(
       new AuthorizeAppOperation(
           operation_registry(),
           url_request_context_getter_,
           url_generator_,
-          base::Bind(&ParseResourceEntryAndRun,
-                     base::Bind(&ExtractOpenLinkAndRun, app_id, callback)),
+          callback,
           resource_id,
           app_id));
 }
 
 bool GDataWapiService::HasAccessToken() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   return runner_->auth_service()->HasAccessToken();
 }
 
@@ skipping 29 matching lines @@
 }
 
 void GDataWapiService::OnProgressUpdate(
     const OperationProgressStatusList& list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(
       DriveServiceObserver, observers_, OnProgressUpdate(list));
 }
 
 }  // namespace google_apis