google_apis: DriveServiceInterface::GetResourceEntry() returns ResourceEntry

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 89 matching lines @@
     return;
   }
 
   base::PostTaskAndReplyWithResult(
       BrowserThread::GetBlockingPool(),
       FROM_HERE,
       base::Bind(&ParseResourceListOnBlockingPool, base::Passed(&value)),
       base::Bind(&DidParseResourceListOnBlockingPool, callback, error));
 }
 
+// Parses the JSON value to ResourceEntry runs |callback|.
+void ParseResourceEntryAndRun(const GetResourceEntryCallback& callback,
+                              GDataErrorCode error,
+                              scoped_ptr<base::Value> value) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  if (!value) {
+    callback.Run(error, scoped_ptr<ResourceEntry>());
+    return;
+  }
+
+  // Parsing ResourceEntry is cheap enough to do on UI thread.
+  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());
+}
+
 // OAuth2 scopes for the documents API.
 const char kDocsListScope[] = "https://docs.google.com/feeds/";
 const char kSpreadsheetsScope[] = "https://spreadsheets.google.com/feeds/";
 const char kUserContentScope[] = "https://docs.googleusercontent.com/";
 const char kDriveAppsScope[] = "https://www.googleapis.com/auth/drive.apps";
 
 }  // namespace
 
 GDataWapiService::GDataWapiService(
     net::URLRequestContextGetter* url_request_context_getter,
@@ skipping 86 matching lines @@
           url,
           static_cast<int>(start_changestamp),
           search_query,
           shared_with_me,
           directory_resource_id,
           base::Bind(&ParseResourceListAndRun, callback)));
 }
 
 void GDataWapiService::GetResourceEntry(
     const std::string& resource_id,
-    const GetDataCallback& callback) {
+    const GetResourceEntryCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   runner_->StartOperationWithRetry(
-      new GetResourceEntryOperation(operation_registry(),
-                                    url_request_context_getter_,
-                                    url_generator_,
-                                    resource_id,
-                                    callback));
+      new GetResourceEntryOperation(
+          operation_registry(),
+          url_request_context_getter_,
+          url_generator_,
+          resource_id,
+          base::Bind(&ParseResourceEntryAndRun, callback)));
 }
 
 void GDataWapiService::GetAccountMetadata(const GetDataCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   runner_->StartOperationWithRetry(
       new GetAccountMetadataOperation(operation_registry(),
                                       url_request_context_getter_,
                                       url_generator_,
@@ skipping 211 matching lines @@
       DriveServiceObserver, observers_, OnProgressUpdate(list));
 }
 
 void GDataWapiService::OnAuthenticationFailed(GDataErrorCode error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(
       DriveServiceObserver, observers_, OnAuthenticationFailed(error));
 }
 
 }  // namespace google_apis