Revert 288017 "Parse Drive API responses all at once in the bloc..."

trunk/src/chrome/browser/drive/drive_api_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/drive/drive_api_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
+#include "base/sequenced_task_runner.h"
 #include "base/strings/stringprintf.h"
+#include "base/task_runner_util.h"
+#include "base/values.h"
 #include "chrome/browser/drive/drive_api_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/drive/auth_service.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/drive_api_requests.h"
 #include "google_apis/drive/gdata_errorcode.h"
 #include "google_apis/drive/gdata_wapi_parser.h"
 #include "google_apis/drive/gdata_wapi_requests.h"
 #include "google_apis/drive/request_sender.h"
 #include "google_apis/google_api_keys.h"
@@ skipping 117 matching lines @@
     if (open_with_links[i].app_id == app_id) {
       callback.Run(HTTP_SUCCESS, open_with_links[i].open_url);
       return;
     }
   }
 
   // Not found.
   callback.Run(GDATA_OTHER_ERROR, GURL());
 }
 
-void ExtractShareUrlAndRun(const google_apis::GetShareUrlCallback& callback,
-                           google_apis::GDataErrorCode error,
-                           scoped_ptr<google_apis::ResourceEntry> entry) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-
-  const google_apis::Link* share_link =
-      entry ? entry->GetLinkByType(google_apis::Link::LINK_SHARE) : NULL;
-  callback.Run(error, share_link ? share_link->href() : GURL());
-}
-
 // Ignores the |entry|, and runs the |callback|.
 void EntryActionCallbackAdapter(
     const EntryActionCallback& callback,
     GDataErrorCode error, scoped_ptr<FileResource> entry) {
   callback.Run(error);
 }
 
 // The resource ID for the root directory for Drive API is defined in the spec:
 // https://developers.google.com/drive/folder
 const char kDriveApiRootDirectoryResourceId[] = "root";
@@ skipping 207 matching lines @@
 
   // Unfortunately "share url" is not yet supported on Drive API v2.
   // So, as a fallback, we use GData WAPI protocol for this method.
   // TODO(hidehiko): Get rid of this implementation when share url is
   // supported on Drive API v2.
   return sender_->StartRequestWithRetry(
       new GetResourceEntryRequest(sender_.get(),
                                   wapi_url_generator_,
                                   resource_id,
                                   embed_origin,
-                                  base::Bind(&ExtractShareUrlAndRun,
+                                  base::Bind(&util::ParseShareUrlAndRun,
                                              callback)));
 }
 
 CancelCallback DriveAPIService::GetAboutResource(
     const AboutResourceCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   AboutGetRequest* request =
       new AboutGetRequest(sender_.get(), url_generator_, callback);
@@ skipping 344 matching lines @@
   if (CanSendRequest()) {
     FOR_EACH_OBSERVER(
         DriveServiceObserver, observers_, OnReadyToSendRequests());
   } else if (!HasRefreshToken()) {
     FOR_EACH_OBSERVER(
         DriveServiceObserver, observers_, OnRefreshTokenInvalid());
   }
 }
 
 }  // namespace drive