Move the responsibility to convert from JSON to AccountMetadata into gdata_wapi_operations.

chrome/browser/google_apis/gdata_wapi_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/gdata_wapi_operations.h"
 
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
@@ skipping 14 matching lines @@
 namespace {
 
 
 const char kUploadContentRange[] = "Content-Range: bytes ";
 
 const char kFeedField[] = "feed";
 
 // Templates for file uploading.
 const char kUploadResponseRange[] = "range";
 
+// Parses the JSON value to AccountMetadataFeed and runs |callback| on the UI
+// thread once parsing is done.
+void ParseAccounetMetadataAndRun(const GetAccountMetadataCallback& callback,
+                                 GDataErrorCode error,
+                                 scoped_ptr<base::Value> value) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(!callback.is_null());
+
+  if (!value) {
+    callback.Run(error, scoped_ptr<AccountMetadataFeed>());
+    return;
+  }
+
+  // Parsing AccountMetadataFeed is cheap enough to do on UI thread.
+  scoped_ptr<AccountMetadataFeed> entry =
+      google_apis::AccountMetadataFeed::CreateFrom(*value);
+  if (!entry) {
+    callback.Run(GDATA_PARSE_ERROR, scoped_ptr<AccountMetadataFeed>());
+    return;
+  }
+
+  callback.Run(error, entry.Pass());
+}
+
 // Parses the |value| to ResourceEntry with error handling.
 // This is designed to be used for ResumeUploadOperation and
 // GetUploadStatusOperation.
 scoped_ptr<ResourceEntry> ParseResourceEntry(scoped_ptr<base::Value> value) {
   scoped_ptr<ResourceEntry> entry;
   if (value.get()) {
     entry = ResourceEntry::ExtractAndParse(*value);
 
     // Note: |value| may be NULL, in particular if the callback is for a
     // failure.
@@ skipping 58 matching lines @@
 GURL GetResourceEntryOperation::GetURL() const {
   return url_generator_.GenerateEditUrl(resource_id_);
 }
 
 //========================= GetAccountMetadataOperation ========================
 
 GetAccountMetadataOperation::GetAccountMetadataOperation(
     OperationRegistry* registry,
     net::URLRequestContextGetter* url_request_context_getter,
     const GDataWapiUrlGenerator& url_generator,
-    const GetDataCallback& callback)
-    : GetDataOperation(registry, url_request_context_getter, callback),
+    const GetAccountMetadataCallback& callback)
+    : GetDataOperation(registry, url_request_context_getter,
+                       base::Bind(&ParseAccounetMetadataAndRun, callback)),
       url_generator_(url_generator) {
   DCHECK(!callback.is_null());
 }
 
 GetAccountMetadataOperation::~GetAccountMetadataOperation() {}
 
 GURL GetAccountMetadataOperation::GetURL() const {
   return url_generator_.GenerateAccountMetadataUrl();
 }
 
@@ skipping 526 matching lines @@
       base::Int64ToString(content_length_));
   return headers;
 }
 
 void GetUploadStatusOperation::OnRangeOperationComplete(
     const UploadRangeResponse& response, scoped_ptr<base::Value> value) {
   callback_.Run(response, ParseResourceEntry(value.Pass()));
 }
 
 }  // namespace google_apis