Refactor GetAboutRequest and GetApplistRequest.

chrome/browser/drive/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/drive/gdata_wapi_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/drive/drive_api_util.h"
 #include "chrome/browser/google_apis/auth_service.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "chrome/browser/google_apis/gdata_wapi_requests.h"
 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h"
 #include "chrome/browser/google_apis/request_sender.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 using google_apis::AboutResource;
+using google_apis::AboutResourceCallback;
 using google_apis::AccountMetadata;
 using google_apis::AddResourceToDirectoryRequest;
 using google_apis::AppList;
+using google_apis::AppListCallback;
+using google_apis::AuthService;
 using google_apis::AuthStatusCallback;
 using google_apis::AuthorizeAppCallback;
 using google_apis::AuthorizeAppRequest;
-using google_apis::AuthService;
 using google_apis::CancelCallback;
 using google_apis::CopyHostedDocumentRequest;
 using google_apis::CreateDirectoryRequest;
 using google_apis::DeleteResourceRequest;
 using google_apis::DownloadActionCallback;
 using google_apis::DownloadFileRequest;
 using google_apis::EntryActionCallback;
+using google_apis::GDATA_PARSE_ERROR;
 using google_apis::GDataErrorCode;
-using google_apis::GDATA_PARSE_ERROR;
-using google_apis::GetAboutResourceCallback;
 using google_apis::GetAccountMetadataRequest;
-using google_apis::GetAppListCallback;
 using google_apis::GetContentCallback;
 using google_apis::GetResourceEntryCallback;
 using google_apis::GetResourceEntryRequest;
 using google_apis::GetResourceListCallback;
 using google_apis::GetResourceListRequest;
 using google_apis::GetShareUrlCallback;
 using google_apis::GetUploadStatusRequest;
 using google_apis::HTTP_NOT_IMPLEMENTED;
 using google_apis::InitiateUploadCallback;
 using google_apis::InitiateUploadExistingFileRequest;
@@ skipping 36 matching lines @@
       google_apis::ResourceEntry::ExtractAndParse(*value);
   if (!entry) {
     callback.Run(GDATA_PARSE_ERROR, scoped_ptr<ResourceEntry>());
     return;
   }
 
   callback.Run(error, entry.Pass());
 }
 
 void ParseAboutResourceAndRun(
-    const GetAboutResourceCallback& callback,
+    const AboutResourceCallback& 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(
         *account_metadata, kWapiRootDirectoryResourceId);
   }
 
   callback.Run(error, about_resource.Pass());
 }
 
 void ParseAppListAndRun(
-    const GetAppListCallback& callback,
+    const AppListCallback& callback,
     GDataErrorCode error,
     scoped_ptr<AccountMetadata> account_metadata) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   scoped_ptr<AppList> app_list;
   if (account_metadata) {
     app_list = AppList::CreateFromAccountMetadata(*account_metadata);
   }
 
@@ skipping 192 matching lines @@
   return sender_->StartRequestWithRetry(
       new GetResourceEntryRequest(sender_.get(),
                                   url_generator_,
                                   resource_id,
                                   embed_origin,
                                   base::Bind(&util::ParseShareUrlAndRun,
                                              callback)));
 }
 
 CancelCallback GDataWapiService::GetAboutResource(
-    const GetAboutResourceCallback& callback) {
+    const AboutResourceCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   return sender_->StartRequestWithRetry(
       new GetAccountMetadataRequest(
           sender_.get(),
           url_generator_,
           base::Bind(&ParseAboutResourceAndRun, callback),
           false));  // Exclude installed apps.
 }
 
-CancelCallback GDataWapiService::GetAppList(
-    const GetAppListCallback& callback) {
+CancelCallback GDataWapiService::GetAppList(const AppListCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   return sender_->StartRequestWithRetry(
       new GetAccountMetadataRequest(sender_.get(),
                                     url_generator_,
                                     base::Bind(&ParseAppListAndRun, callback),
                                     true));  // Include installed apps.
 }
 
@@ skipping 292 matching lines @@
   if (CanSendRequest()) {
     FOR_EACH_OBSERVER(
         DriveServiceObserver, observers_, OnReadyToSendRequests());
   } else if (!HasRefreshToken()) {
     FOR_EACH_OBSERVER(
         DriveServiceObserver, observers_, OnRefreshTokenInvalid());
   }
 }
 
 }  // namespace drive