Refactor GetAboutRequest and GetApplistRequest.

chrome/browser/google_apis/drive_api_requests.h

 // 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.
 
 #ifndef CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_REQUESTS_H_
 #define CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_REQUESTS_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
 #include "chrome/browser/google_apis/base_requests.h"
 #include "chrome/browser/google_apis/drive_api_url_generator.h"
 #include "chrome/browser/google_apis/drive_common_callbacks.h"
 
 namespace google_apis {
 
 class FileResource;
 
 // Callback used for requests that the server returns FileResource data
 // formatted into JSON value.
 typedef base::Callback<void(GDataErrorCode error,
                             scoped_ptr<FileResource> entry)>
     FileResourceCallback;
 
-
-//============================== GetAboutRequest =============================
-
-// This class performs the request for fetching About data.
-class GetAboutRequest : public GetDataRequest {
- public:
-  GetAboutRequest(RequestSender* sender,
-                  const DriveApiUrlGenerator& url_generator,
-                  const GetAboutResourceCallback& callback);
-  virtual ~GetAboutRequest();
-
- protected:
-  // Overridden from GetDataRequest.
-  virtual GURL GetURL() const OVERRIDE;
-
- private:
-  const DriveApiUrlGenerator url_generator_;
-
-  DISALLOW_COPY_AND_ASSIGN(GetAboutRequest);
-};
-
-//============================= GetApplistRequest ============================
-
-// This class performs the request for fetching Applist.
-class GetApplistRequest : public GetDataRequest {
- public:
-  GetApplistRequest(RequestSender* sender,
-                    const DriveApiUrlGenerator& url_generator,
-                    const GetDataCallback& callback);
-  virtual ~GetApplistRequest();
-
- protected:
-  // Overridden from GetDataRequest.
-  virtual GURL GetURL() const OVERRIDE;
-
- private:
-  const DriveApiUrlGenerator url_generator_;
-
-  DISALLOW_COPY_AND_ASSIGN(GetApplistRequest);
-};
-
 //============================ GetChangelistRequest ==========================
 
 // This class performs the request for fetching changelist.
 // The result may contain only first part of the result. The remaining result
 // should be able to be fetched by ContinueGetFileListRequest defined below.
 class GetChangelistRequest : public GetDataRequest {
  public:
   // |include_deleted| specifies if the response should contain the changes
   // for deleted entries or not.
   // |start_changestamp| specifies the starting point of change list or 0 if
@@ skipping 70 matching lines @@
 };
 
 // This namespace is introduced to avoid class name confliction between
 // the requests for Drive API v2 and GData WAPI for transition.
 // And, when the migration is done and GData WAPI's code is cleaned up,
 // classes inside this namespace should be moved to the google_apis namespace.
 // TODO(hidehiko): Move all the requests defined in this file into drive
 // namespace.  crbug.com/180808
 namespace drive {
 
+//============================== AboutGetRequest =============================
+
+// This class performs the request for fetching About data.
+// This request is mapped to
+// https://developers.google.com/drive/v2/reference/about/get
+class AboutGetRequest : public GetDataRequest {
+ public:
+  AboutGetRequest(RequestSender* sender,
+                  const DriveApiUrlGenerator& url_generator,
+                  const AboutResourceCallback& callback);
+  virtual ~AboutGetRequest();
+
+ protected:
+  // Overridden from GetDataRequest.
+  virtual GURL GetURL() const OVERRIDE;
+
+ private:
+  const DriveApiUrlGenerator url_generator_;
+
+  DISALLOW_COPY_AND_ASSIGN(AboutGetRequest);
+};
+
+//============================= AppsListRequest ============================
+
+// This class performs the request for fetching AppList.
+// This request is mapped to
+// https://developers.google.com/drive/v2/reference/apps/list
+class AppsListRequest : public GetDataRequest {
+ public:
+  AppsListRequest(RequestSender* sender,
+                  const DriveApiUrlGenerator& url_generator,
+                  const AppListCallback& callback);
+  virtual ~AppsListRequest();
+
+ protected:
+  // Overridden from GetDataRequest.
+  virtual GURL GetURL() const OVERRIDE;
+
+ private:
+  const DriveApiUrlGenerator url_generator_;
+
+  DISALLOW_COPY_AND_ASSIGN(AppsListRequest);
+};
+
 //======================= ContinueGetFileListRequest =========================
 
 // This class performs the request to fetch remaining Filelist result.
 class ContinueGetFileListRequest : public GetDataRequest {
  public:
   ContinueGetFileListRequest(RequestSender* sender,
                              const GURL& url,
                              const GetDataCallback& callback);
   virtual ~ContinueGetFileListRequest();
 
@@ skipping 384 matching lines @@
                       const ProgressCallback& progress_callback);
   virtual ~DownloadFileRequest();
 
   DISALLOW_COPY_AND_ASSIGN(DownloadFileRequest);
 };
 
 }  // namespace drive
 }  // namespace google_apis
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_REQUESTS_H_