Move the responsibility to convert from JSON to FileResource into drive_api_operations.

chrome/browser/google_apis/drive_api_operations.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_OPERATIONS_H_
 #define CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_OPERATIONS_H_
 
 #include <string>
 
+#include "base/callback.h"

[hashimoto, 2013/03/01 02:29:19]

nit: Can't this be replaced with callback_forward.h?

[hidehiko, 2013/03/01 03:53:55]

Done.

 #include "chrome/browser/google_apis/base_operations.h"
 #include "chrome/browser/google_apis/drive_api_url_generator.h"
 #include "chrome/browser/google_apis/drive_service_interface.h"
 
 namespace net {
 class URLRequestContextGetter;
 }  // namespace net
 
 namespace google_apis {
 
+class FileResource;
+
+// Callback used for operations that the server returns FileResource data
+// formatted into JSON value.
+typedef base::Callback<void(GDataErrorCode error,
+                            scoped_ptr<FileResource> entry)>
+    FileResourceCallback;
+
+
 //============================== GetAboutOperation =============================
 
 // This class performs the operation for fetching About data.
 class GetAboutOperation : public GetDataOperation {
  public:
   GetAboutOperation(OperationRegistry* registry,
                     net::URLRequestContextGetter* url_request_context_getter,
                     const DriveApiUrlGenerator& url_generator,
                     const GetAboutResourceCallback& callback);
   virtual ~GetAboutOperation();
@@ skipping 88 matching lines @@
 
 //=============================== GetFlieOperation =============================
 
 // This class performs the operation for fetching a file.
 class GetFileOperation : public GetDataOperation {
  public:
   GetFileOperation(OperationRegistry* registry,
                    net::URLRequestContextGetter* url_request_context_getter,
                    const DriveApiUrlGenerator& url_generator,
                    const std::string& file_id,
-                   const GetDataCallback& callback);
+                   const FileResourceCallback& callback);
   virtual ~GetFileOperation();
 
  protected:
   // Overridden from GetDataOperation.
   virtual GURL GetURL() const OVERRIDE;
 
  private:
   const DriveApiUrlGenerator url_generator_;
   std::string file_id_;
 
@@ skipping 11 matching lines @@
 
 // This class performs the operation for creating a directory.
 class CreateDirectoryOperation : public GetDataOperation {
  public:
   CreateDirectoryOperation(
       OperationRegistry* registry,
       net::URLRequestContextGetter* url_request_context_getter,
       const DriveApiUrlGenerator& url_generator,
       const std::string& parent_resource_id,
       const std::string& directory_name,
-      const GetDataCallback& callback);
+      const FileResourceCallback& callback);
   virtual ~CreateDirectoryOperation();
 
  protected:
   // Overridden from GetDataOperation.
   virtual GURL GetURL() const OVERRIDE;
   virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
   virtual bool GetContentData(std::string* upload_content_type,
                               std::string* upload_content) OVERRIDE;
 
  private:
@@ skipping 134 matching lines @@
   const std::string parent_resource_id_;
   const std::string resource_id_;
 
   DISALLOW_COPY_AND_ASSIGN(DeleteResourceOperation);
 };
 
 }  // namespace drive
 }  // namespace google_apis
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_OPERATIONS_H_