google_apis: DriveServiceInterface::GetResourceEntry() returns ResourceEntry

chrome/browser/chromeos/drive/drive_api_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/chromeos/drive/drive_api_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 43 matching lines @@
       google_apis::ResourceList::CreateFromChangeList(*change_list);
   if (!resource_list) {
     callback.Run(google_apis::GDATA_PARSE_ERROR,
                  scoped_ptr<google_apis::ResourceList>());
     return;
   }
 
   callback.Run(error, resource_list.Pass());
 }
 
+// Parses the JSON value to ResourceEntry runs |callback|.
+void ParseResourceEntryAndRun(
+    const google_apis::GetResourceEntryCallback& callback,
+    google_apis::GDataErrorCode error,
+    scoped_ptr<base::Value> value) {
+  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  if (!value) {
+    callback.Run(error, scoped_ptr<google_apis::ResourceEntry>());
+    return;
+  }
+
+  // Parsing FileResource is cheap enough to do on UI thread.
+  scoped_ptr<google_apis::FileResource> file_resource =
+      google_apis::FileResource::CreateFrom(*value);
+  if (!file_resource) {
+    callback.Run(google_apis::GDATA_PARSE_ERROR,
+                 scoped_ptr<google_apis::ResourceEntry>());
+    return;
+  }
+
+  // Converting to ResourceEntry is cheap enough to do on UI thread.
+  scoped_ptr<google_apis::ResourceEntry> entry =
+      google_apis::ResourceEntry::CreateFromFileResource(*file_resource);
+  if (!entry) {
+    callback.Run(google_apis::GDATA_PARSE_ERROR,
+                 scoped_ptr<google_apis::ResourceEntry>());
+    return;
+  }
+
+  callback.Run(error, entry.Pass());
+}
+
 }  // namespace
 
 DriveAPIService::DriveAPIService(
     net::URLRequestContextGetter* url_request_context_getter,
     const std::string& custom_user_agent)
     : url_request_context_getter_(url_request_context_getter),
       profile_(NULL),
       runner_(NULL),
       custom_user_agent_(custom_user_agent) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 103 matching lines @@
       new google_apis::GetChangelistOperation(
           operation_registry(),
           url_request_context_getter_,
           url,
           start_changestamp,
           base::Bind(&ParseResourceListAndRun, callback)));
 }
 
 void DriveAPIService::GetResourceEntry(
     const std::string& resource_id,
-    const google_apis::GetDataCallback& callback) {
+    const google_apis::GetResourceEntryCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   runner_->StartOperationWithRetry(new google_apis::GetFileOperation(
       operation_registry(),
       url_request_context_getter_,
       resource_id,
-      callback));
+      base::Bind(&ParseResourceEntryAndRun, callback)));
 }
 
 void DriveAPIService::GetAccountMetadata(
     const google_apis::GetDataCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   runner_->StartOperationWithRetry(
       new google_apis::GetAboutOperation(operation_registry(),
                                          url_request_context_getter_,
@@ skipping 168 matching lines @@
 
 void DriveAPIService::OnAuthenticationFailed(
     google_apis::GDataErrorCode error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(
       google_apis::DriveServiceObserver, observers_,
       OnAuthenticationFailed(error));
 }
 
 }  // namespace drive