Refactor GetAboutRequest and GetApplistRequest.

chrome/browser/google_apis/drive_api_requests.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/drive_api_requests.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
@@ skipping 51 matching lines @@
           scoped_ptr<FileResource>());
       return;
     }
   }
 
   callback.Run(response, file_resource.Pass());
 }
 
 }  // namespace
 
-//============================== GetAboutRequest =============================
-
-GetAboutRequest::GetAboutRequest(
-    RequestSender* sender,
-    const DriveApiUrlGenerator& url_generator,
-    const GetAboutResourceCallback& callback)
-    : GetDataRequest(sender,
-                     base::Bind(&ParseJsonAndRun<AboutResource>, callback)),
-      url_generator_(url_generator) {
-  DCHECK(!callback.is_null());
-}
-
-GetAboutRequest::~GetAboutRequest() {}
-
-GURL GetAboutRequest::GetURL() const {
-  return url_generator_.GetAboutUrl();
-}
-
-//============================== GetApplistRequest ===========================
-
-GetApplistRequest::GetApplistRequest(
-    RequestSender* sender,
-    const DriveApiUrlGenerator& url_generator,
-    const GetDataCallback& callback)
-    : GetDataRequest(sender, callback),
-      url_generator_(url_generator) {
-  DCHECK(!callback.is_null());
-}
-
-GetApplistRequest::~GetApplistRequest() {}
-
-GURL GetApplistRequest::GetURL() const {
-  return url_generator_.GetApplistUrl();
-}
-
 //============================ GetChangelistRequest ==========================
 
 GetChangelistRequest::GetChangelistRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     bool include_deleted,
     int64 start_changestamp,
     int max_results,
     const GetDataCallback& callback)
     : GetDataRequest(sender, callback),
@@ skipping 47 matching lines @@
 }
 
 GetFileRequest::~GetFileRequest() {}
 
 GURL GetFileRequest::GetURL() const {
   return url_generator_.GetFileUrl(file_id_);
 }
 
 namespace drive {
 
+//============================== AboutGetRequest =============================
+
+AboutGetRequest::AboutGetRequest(
+    RequestSender* sender,
+    const DriveApiUrlGenerator& url_generator,
+    const AboutResourceCallback& callback)
+    : GetDataRequest(sender,
+                     base::Bind(&ParseJsonAndRun<AboutResource>, callback)),
+      url_generator_(url_generator) {
+  DCHECK(!callback.is_null());
+}
+
+AboutGetRequest::~AboutGetRequest() {}
+
+GURL AboutGetRequest::GetURL() const {
+  return url_generator_.GetAboutGetUrl();
+}
+
+//============================== AppsListRequest ===========================
+
+AppsListRequest::AppsListRequest(
+    RequestSender* sender,
+    const DriveApiUrlGenerator& url_generator,
+    const AppListCallback& callback)
+    : GetDataRequest(sender,
+                     base::Bind(&ParseJsonAndRun<AppList>, callback)),
+      url_generator_(url_generator) {
+  DCHECK(!callback.is_null());
+}
+
+AppsListRequest::~AppsListRequest() {}
+
+GURL AppsListRequest::GetURL() const {
+  return url_generator_.GetAppsListUrl();
+}
+
 //======================= ContinueGetFileListRequest =========================
 
 ContinueGetFileListRequest::ContinueGetFileListRequest(
     RequestSender* sender,
     const GURL& url,
     const GetDataCallback& callback)
     : GetDataRequest(sender, callback),
       url_(url) {
   DCHECK(!callback.is_null());
 }
@@ skipping 477 matching lines @@
           progress_callback,
           url_generator.GenerateDownloadFileUrl(resource_id),
           output_file_path) {
 }
 
 DownloadFileRequest::~DownloadFileRequest() {
 }
 
 }  // namespace drive
 }  // namespace google_apis