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

chrome/browser/google_apis/gdata_wapi_service.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_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 76 matching lines @@
   scoped_ptr<ResourceEntry> entry =
       google_apis::ResourceEntry::ExtractAndParse(*value);
   if (!entry) {
     callback.Run(GDATA_PARSE_ERROR, scoped_ptr<ResourceEntry>());
     return;
   }
 
   callback.Run(error, entry.Pass());
 }
 
-// Parses the JSON value to AccountMetadataFeed on the blocking pool 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());
-}
-
 // Extracts the open link url from the JSON Feed. Used by AuthorizeApp().
 void ExtractOpenLinkAndRun(const std::string app_id,
                            const AuthorizeAppCallback& callback,
                            GDataErrorCode error,
                            scoped_ptr<ResourceEntry> entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Entry not found in the feed.
   if (!entry) {
     callback.Run(error, GURL());
@@ skipping 143 matching lines @@
 void GDataWapiService::GetAccountMetadata(
     const GetAccountMetadataCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   runner_->StartOperationWithRetry(
       new GetAccountMetadataOperation(
           operation_registry(),
           url_request_context_getter_,
           url_generator_,
-          base::Bind(&ParseAccounetMetadataAndRun, callback)));
+          callback));
 }
 
 void GDataWapiService::GetAboutResource(
     const GetAboutResourceCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   // TODO(hidehiko): Implement this.
   NOTREACHED();
 }
@@ skipping 270 matching lines @@
 }
 
 void GDataWapiService::OnProgressUpdate(
     const OperationProgressStatusList& list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(
       DriveServiceObserver, observers_, OnProgressUpdate(list));
 }
 
 }  // namespace google_apis