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

chrome/browser/google_apis/drive_api_operations.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_operations.h"
 
 #include "base/bind.h"
+#include "base/callback.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/google_apis/drive_api_parser.h"
 #include "chrome/browser/google_apis/operation_util.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace google_apis {
 namespace {
 
 const char kContentTypeApplicationJson[] = "application/json";
 const char kDirectoryMimeType[] = "application/vnd.google-apps.folder";
 
-// Parses the JSON value to AboutResource and runs |callback| on the UI
+// Parses the JSON value to a resource typed |T| and runs |callback| on the UI
 // thread once parsing is done.
-void ParseAboutResourceAndRun(
-    const GetAboutResourceCallback& callback,
+template<typename T>
+void ParseJsonAndRun(
+    const base::Callback<void(GDataErrorCode, scoped_ptr<T>)>& callback,
     GDataErrorCode error,
     scoped_ptr<base::Value> value) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
-  scoped_ptr<AboutResource> about_resource;
+  scoped_ptr<T> resource;
   if (value.get()) {
-    about_resource = AboutResource::CreateFrom(*value);
-    if (!about_resource) {
-      // Failed to parse the JSON value (although the JSON value is available),
-      // so let callback know the parsing error.
+    resource = T::CreateFrom(*value);
+    if (!resource) {
+      // Failed to parse the JSON value, although the JSON value is available,
+      // so let the callback know the parsing error.
       error = GDATA_PARSE_ERROR;
     }
   }
 
-  callback.Run(error, about_resource.Pass());
+  callback.Run(error, resource.Pass());
 }
 
 }  // namespace
 
 //============================== GetAboutOperation =============================
 
 GetAboutOperation::GetAboutOperation(
     OperationRegistry* registry,
     net::URLRequestContextGetter* url_request_context_getter,
     const DriveApiUrlGenerator& url_generator,
     const GetAboutResourceCallback& callback)
     : GetDataOperation(registry, url_request_context_getter,
-                       base::Bind(&ParseAboutResourceAndRun, callback)),
+                       base::Bind(&ParseJsonAndRun<AboutResource>, callback)),
       url_generator_(url_generator) {
   DCHECK(!callback.is_null());
 }
 
 GetAboutOperation::~GetAboutOperation() {}
 
 GURL GetAboutOperation::GetURL() const {
   return url_generator_.GetAboutUrl();
 }
 
@@ skipping 59 matching lines @@
   return url_generator_.GetFilelistUrl(url_, search_string_);
 }
 
 //=============================== GetFlieOperation =============================
 
 GetFileOperation::GetFileOperation(
     OperationRegistry* registry,
     net::URLRequestContextGetter* url_request_context_getter,
     const DriveApiUrlGenerator& url_generator,
     const std::string& file_id,
-    const GetDataCallback& callback)
-    : GetDataOperation(registry, url_request_context_getter, callback),
+    const FileResourceCallback& callback)
+    : GetDataOperation(registry, url_request_context_getter,
+                       base::Bind(&ParseJsonAndRun<FileResource>, callback)),
       url_generator_(url_generator),
       file_id_(file_id) {
   DCHECK(!callback.is_null());
 }
 
 GetFileOperation::~GetFileOperation() {}
 
 GURL GetFileOperation::GetURL() const {
   return url_generator_.GetFileUrl(file_id_);
 }
 
 namespace drive {
 
 //========================== CreateDirectoryOperation ==========================
 
 CreateDirectoryOperation::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)
-    : GetDataOperation(registry, url_request_context_getter, callback),
+    const FileResourceCallback& callback)
+    : GetDataOperation(registry, url_request_context_getter,
+                       base::Bind(&ParseJsonAndRun<FileResource>, callback)),
       url_generator_(url_generator),
       parent_resource_id_(parent_resource_id),
       directory_name_(directory_name) {
   DCHECK(!callback.is_null());
 }
 
 CreateDirectoryOperation::~CreateDirectoryOperation() {}
 
 GURL CreateDirectoryOperation::GetURL() const {
   if (parent_resource_id_.empty() || directory_name_.empty()) {
@@ skipping 159 matching lines @@
   return url_generator_.GetChildrenUrlForRemoval(
       parent_resource_id_, resource_id_);
 }
 
 net::URLFetcher::RequestType DeleteResourceOperation::GetRequestType() const {
   return net::URLFetcher::DELETE_REQUEST;
 }
 
 }  // namespace drive
 }  // namespace google_apis