Revert 288017 "Parse Drive API responses all at once in the bloc..."

trunk/src/google_apis/drive/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 "google_apis/drive/drive_api_requests.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
 #include "base/sequenced_task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/values.h"
+#include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/request_sender.h"
 #include "google_apis/drive/request_util.h"
 #include "google_apis/drive/time_util.h"
 #include "net/base/url_util.h"
 
 namespace google_apis {
 namespace {
 
 const char kContentTypeApplicationJson[] = "application/json";
 const char kParentLinkKind[] = "drive#fileLink";
 
+// Parses the JSON value to a resource typed |T| and runs |callback| on the UI
+// thread once parsing is done.
+template<typename T>
+void ParseJsonAndRun(
+    const base::Callback<void(GDataErrorCode, scoped_ptr<T>)>& callback,
+    GDataErrorCode error,
+    scoped_ptr<base::Value> value) {
+  DCHECK(!callback.is_null());
+
+  scoped_ptr<T> resource;
+  if (value) {
+    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, resource.Pass());
+}
+
+// Thin adapter of T::CreateFrom.
+template<typename T>
+scoped_ptr<T> ParseJsonOnBlockingPool(scoped_ptr<base::Value> value) {
+  return T::CreateFrom(*value);
+}
+
+// Runs |callback| with given |error| and |value|. If |value| is null,
+// overwrites |error| to GDATA_PARSE_ERROR.
+template<typename T>
+void ParseJsonOnBlockingPoolAndRunAfterBlockingPoolTask(
+    const base::Callback<void(GDataErrorCode, scoped_ptr<T>)>& callback,
+    GDataErrorCode error, scoped_ptr<T> value) {
+  if (!value)
+    error = GDATA_PARSE_ERROR;
+  callback.Run(error, value.Pass());
+}
+
+// Parses the JSON value to a resource typed |T| and runs |callback| on
+// blocking pool, and then run on the current thread.
+// TODO(hidehiko): Move this and ParseJsonAndRun defined above into base with
+// merging the tasks running on blocking pool into one.
+template<typename T>
+void ParseJsonOnBlockingPoolAndRun(
+    scoped_refptr<base::TaskRunner> blocking_task_runner,
+    const base::Callback<void(GDataErrorCode, scoped_ptr<T>)>& callback,
+    GDataErrorCode error,
+    scoped_ptr<base::Value> value) {
+  DCHECK(!callback.is_null());
+
+  if (!value) {
+    callback.Run(error, scoped_ptr<T>());
+    return;
+  }
+
+  base::PostTaskAndReplyWithResult(
+      blocking_task_runner,
+      FROM_HERE,
+      base::Bind(&ParseJsonOnBlockingPool<T>, base::Passed(&value)),
+      base::Bind(&ParseJsonOnBlockingPoolAndRunAfterBlockingPoolTask<T>,
+                 callback, error));
+}
+
 // Parses the JSON value to FileResource instance and runs |callback| on the
 // UI thread once parsing is done.
 // This is customized version of ParseJsonAndRun defined above to adapt the
 // remaining response type.
 void ParseFileResourceWithUploadRangeAndRun(
     const drive::UploadRangeCallback& callback,
     const UploadRangeResponse& response,
     scoped_ptr<base::Value> value) {
   DCHECK(!callback.is_null());
 
@@ skipping 19 matching lines @@
   scoped_ptr<base::DictionaryValue> parent(new base::DictionaryValue);
   parent->SetString("kind", kParentLinkKind);
   parent->SetString("id", file_id);
   return parent.Pass();
 }
 
 }  // namespace
 
 namespace drive {
 
-//============================ DriveApiPartialFieldRequest ====================
+//============================ DriveApiDataRequest ===========================
 
-DriveApiPartialFieldRequest::DriveApiPartialFieldRequest(
-    RequestSender* sender) : UrlFetchRequestBase(sender) {
+DriveApiDataRequest::DriveApiDataRequest(RequestSender* sender,
+                                         const GetDataCallback& callback)
+    : GetDataRequest(sender, callback) {
 }
 
-DriveApiPartialFieldRequest::~DriveApiPartialFieldRequest() {
+DriveApiDataRequest::~DriveApiDataRequest() {
 }
 
-GURL DriveApiPartialFieldRequest::GetURL() const {
+GURL DriveApiDataRequest::GetURL() const {
   GURL url = GetURLInternal();
   if (!fields_.empty())
     url = net::AppendOrReplaceQueryParameter(url, "fields", fields_);
   return url;
 }
 
 //=============================== FilesGetRequest =============================
 
 FilesGetRequest::FilesGetRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const FileResourceCallback& callback)
-    : DriveApiDataRequest<FileResource>(sender, callback),
+    : DriveApiDataRequest(
+          sender,
+          base::Bind(&ParseJsonAndRun<FileResource>, callback)),
       url_generator_(url_generator) {
   DCHECK(!callback.is_null());
 }
 
 FilesGetRequest::~FilesGetRequest() {}
 
 GURL FilesGetRequest::GetURLInternal() const {
   return url_generator_.GetFilesGetUrl(file_id_);
 }
 
 //============================ FilesAuthorizeRequest ===========================
 
 FilesAuthorizeRequest::FilesAuthorizeRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const FileResourceCallback& callback)
-    : DriveApiDataRequest<FileResource>(sender, callback),
+    : DriveApiDataRequest(
+          sender,
+          base::Bind(&ParseJsonAndRun<FileResource>, callback)),
       url_generator_(url_generator) {
   DCHECK(!callback.is_null());
 }
 
 FilesAuthorizeRequest::~FilesAuthorizeRequest() {}
 
 net::URLFetcher::RequestType FilesAuthorizeRequest::GetRequestType() const {
   return net::URLFetcher::POST;
 }
 
 GURL FilesAuthorizeRequest::GetURLInternal() const {
   return url_generator_.GetFilesAuthorizeUrl(file_id_, app_id_);
 }
 
 //============================ FilesInsertRequest ============================
 
 FilesInsertRequest::FilesInsertRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const FileResourceCallback& callback)
-    : DriveApiDataRequest<FileResource>(sender, callback),
+    : DriveApiDataRequest(
+          sender,
+          base::Bind(&ParseJsonAndRun<FileResource>, callback)),
       url_generator_(url_generator) {
   DCHECK(!callback.is_null());
 }
 
 FilesInsertRequest::~FilesInsertRequest() {}
 
 net::URLFetcher::RequestType FilesInsertRequest::GetRequestType() const {
   return net::URLFetcher::POST;
 }
 
@@ skipping 36 matching lines @@
 GURL FilesInsertRequest::GetURLInternal() const {
   return url_generator_.GetFilesInsertUrl();
 }
 
 //============================== FilesPatchRequest ============================
 
 FilesPatchRequest::FilesPatchRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const FileResourceCallback& callback)
-    : DriveApiDataRequest<FileResource>(sender, callback),
+    : DriveApiDataRequest(
+          sender,
+          base::Bind(&ParseJsonAndRun<FileResource>, callback)),
       url_generator_(url_generator),
       set_modified_date_(false),
       update_viewed_date_(true) {
   DCHECK(!callback.is_null());
 }
 
 FilesPatchRequest::~FilesPatchRequest() {}
 
 net::URLFetcher::RequestType FilesPatchRequest::GetRequestType() const {
   return net::URLFetcher::PATCH;
@@ skipping 47 matching lines @@
            << *upload_content << "]";
   return true;
 }
 
 //============================= FilesCopyRequest ==============================
 
 FilesCopyRequest::FilesCopyRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const FileResourceCallback& callback)
-    : DriveApiDataRequest<FileResource>(sender, callback),
+    : DriveApiDataRequest(
+          sender,
+          base::Bind(&ParseJsonAndRun<FileResource>, callback)),
       url_generator_(url_generator) {
   DCHECK(!callback.is_null());
 }
 
 FilesCopyRequest::~FilesCopyRequest() {
 }
 
 net::URLFetcher::RequestType FilesCopyRequest::GetRequestType() const {
   return net::URLFetcher::POST;
 }
@@ skipping 32 matching lines @@
            << *upload_content << "]";
   return true;
 }
 
 //============================= FilesListRequest =============================
 
 FilesListRequest::FilesListRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const FileListCallback& callback)
-    : DriveApiDataRequest<FileList>(sender, callback),
+    : DriveApiDataRequest(
+          sender,
+          base::Bind(&ParseJsonOnBlockingPoolAndRun<FileList>,
+                     make_scoped_refptr(sender->blocking_task_runner()),
+                     callback)),
       url_generator_(url_generator),
       max_results_(100) {
   DCHECK(!callback.is_null());
 }
 
 FilesListRequest::~FilesListRequest() {}
 
 GURL FilesListRequest::GetURLInternal() const {
   return url_generator_.GetFilesListUrl(max_results_, page_token_, q_);
 }
 
 //======================== FilesListNextPageRequest =========================
 
 FilesListNextPageRequest::FilesListNextPageRequest(
     RequestSender* sender,
     const FileListCallback& callback)
-    : DriveApiDataRequest<FileList>(sender, callback) {
+    : DriveApiDataRequest(
+          sender,
+          base::Bind(&ParseJsonOnBlockingPoolAndRun<FileList>,
+                     make_scoped_refptr(sender->blocking_task_runner()),
+                     callback)) {
   DCHECK(!callback.is_null());
 }
 
 FilesListNextPageRequest::~FilesListNextPageRequest() {
 }
 
 GURL FilesListNextPageRequest::GetURLInternal() const {
   return next_link_;
 }
 
@@ skipping 24 matching lines @@
   headers.push_back(util::GenerateIfMatchHeader(etag_));
   return headers;
 }
 
 //============================ FilesTrashRequest =============================
 
 FilesTrashRequest::FilesTrashRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const FileResourceCallback& callback)
-    : DriveApiDataRequest<FileResource>(sender, callback),
+    : DriveApiDataRequest(
+          sender,
+          base::Bind(&ParseJsonAndRun<FileResource>, callback)),
       url_generator_(url_generator) {
   DCHECK(!callback.is_null());
 }
 
 FilesTrashRequest::~FilesTrashRequest() {}
 
 net::URLFetcher::RequestType FilesTrashRequest::GetRequestType() const {
   return net::URLFetcher::POST;
 }
 
 GURL FilesTrashRequest::GetURLInternal() const {
   return url_generator_.GetFilesTrashUrl(file_id_);
 }
 
 //============================== AboutGetRequest =============================
 
 AboutGetRequest::AboutGetRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const AboutResourceCallback& callback)
-    : DriveApiDataRequest<AboutResource>(sender, callback),
+    : DriveApiDataRequest(
+          sender,
+          base::Bind(&ParseJsonAndRun<AboutResource>, callback)),
       url_generator_(url_generator) {
   DCHECK(!callback.is_null());
 }
 
 AboutGetRequest::~AboutGetRequest() {}
 
 GURL AboutGetRequest::GetURLInternal() const {
   return url_generator_.GetAboutGetUrl();
 }
 
 //============================ ChangesListRequest ===========================
 
 ChangesListRequest::ChangesListRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const ChangeListCallback& callback)
-    : DriveApiDataRequest<ChangeList>(sender, callback),
+    : DriveApiDataRequest(
+          sender,
+          base::Bind(&ParseJsonOnBlockingPoolAndRun<ChangeList>,
+                     make_scoped_refptr(sender->blocking_task_runner()),
+                     callback)),
       url_generator_(url_generator),
       include_deleted_(true),
       max_results_(100),
       start_change_id_(0) {
   DCHECK(!callback.is_null());
 }
 
 ChangesListRequest::~ChangesListRequest() {}
 
 GURL ChangesListRequest::GetURLInternal() const {
   return url_generator_.GetChangesListUrl(
       include_deleted_, max_results_, page_token_, start_change_id_);
 }
 
 //======================== ChangesListNextPageRequest =========================
 
 ChangesListNextPageRequest::ChangesListNextPageRequest(
     RequestSender* sender,
     const ChangeListCallback& callback)
-    : DriveApiDataRequest<ChangeList>(sender, callback) {
+    : DriveApiDataRequest(
+          sender,
+          base::Bind(&ParseJsonOnBlockingPoolAndRun<ChangeList>,
+                     make_scoped_refptr(sender->blocking_task_runner()),
+                     callback)) {
   DCHECK(!callback.is_null());
 }
 
 ChangesListNextPageRequest::~ChangesListNextPageRequest() {
 }
 
 GURL ChangesListNextPageRequest::GetURLInternal() const {
   return next_link_;
 }
 
 //============================== AppsListRequest ===========================
 
 AppsListRequest::AppsListRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     bool use_internal_endpoint,
     const AppListCallback& callback)
-    : DriveApiDataRequest<AppList>(sender, callback),
+    : DriveApiDataRequest(
+          sender,
+          base::Bind(&ParseJsonAndRun<AppList>, callback)),
       url_generator_(url_generator),
       use_internal_endpoint_(use_internal_endpoint) {
   DCHECK(!callback.is_null());
 }
 
 AppsListRequest::~AppsListRequest() {}
 
 GURL AppsListRequest::GetURLInternal() const {
   return url_generator_.GetAppsListUrl(use_internal_endpoint_);
 }
@@ skipping 347 matching lines @@
       }
       break;
   }
   root.SetString("value", value_);
   base::JSONWriter::Write(&root, upload_content);
   return true;
 }
 
 }  // namespace drive
 }  // namespace google_apis