google_apis: DriveServiceInterface::GetResourceEntry() returns ResourceEntry

chrome/browser/sync_file_system/drive_file_sync_client.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/sync_file_system/drive_file_sync_client.h"
 
 #include <sstream>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 176 matching lines @@
   DCHECK_EQ(google_apis::ENTRY_KIND_FOLDER, entry->kind());
   DCHECK_EQ(ASCIIToUTF16(directory_name), entry->title());
 
   callback.Run(error, entry->resource_id());
 }
 
 void DriveFileSyncClient::DidGetParentDirectoryForCreateDirectory(
     const FilePath::StringType& directory_name,
     const ResourceIdCallback& callback,
     google_apis::GDataErrorCode error,
-    scoped_ptr<base::Value> data) {
+    scoped_ptr<google_apis::ResourceEntry> entry) {
   DCHECK(CalledOnValidThread());
 
   if (error != google_apis::HTTP_SUCCESS) {
     callback.Run(error, std::string());
     return;
   }
-  DCHECK(data);
-
-  scoped_ptr<google_apis::ResourceEntry> entry(
-      google_apis::ResourceEntry::ExtractAndParse(*data));
-  if (!entry) {
-    callback.Run(google_apis::GDATA_PARSE_ERROR, std::string());
-    return;
-  }
+  DCHECK(entry);
 
   drive_service_->AddNewDirectory(
       entry->content_url(),
       directory_name,
       base::Bind(&DriveFileSyncClient::DidCreateDirectory,
                  AsWeakPtr(), callback));
 }
 
 void DriveFileSyncClient::DidCreateDirectory(
     const ResourceIdCallback& callback,
@@ skipping 24 matching lines @@
       base::Bind(&DriveFileSyncClient::DidGetAccountMetadata,
                  AsWeakPtr(), callback));
 }
 
 void DriveFileSyncClient::GetResourceEntry(
     const std::string& resource_id,
     const ResourceEntryCallback& callback) {
   DCHECK(CalledOnValidThread());
   drive_service_->GetResourceEntry(
       resource_id,
-      base::Bind(&DriveFileSyncClient::DidGetResourceEntryData,
+      base::Bind(&DriveFileSyncClient::DidGetResourceEntry,
                  AsWeakPtr(), callback));
 }
 
 void DriveFileSyncClient::DidGetAccountMetadata(
     const ChangeStampCallback& callback,
     google_apis::GDataErrorCode error,
     scoped_ptr<base::Value> data) {
   DCHECK(CalledOnValidThread());
 
   int64 largest_changestamp = 0;
@@ skipping 57 matching lines @@
 }
 
 void DriveFileSyncClient::DownloadFile(
     const std::string& resource_id,
     const std::string& local_file_md5,
     const FilePath& local_file_path,
     const DownloadFileCallback& callback) {
   DCHECK(CalledOnValidThread());
   drive_service_->GetResourceEntry(
       resource_id,
-      base::Bind(&DriveFileSyncClient::DidGetResourceEntryData,
+      base::Bind(&DriveFileSyncClient::DidGetResourceEntry,
                  AsWeakPtr(),
                  base::Bind(&DriveFileSyncClient::DownloadFileInternal,
                             AsWeakPtr(), local_file_md5, local_file_path,
                             callback)));
 }
 
 void DriveFileSyncClient::UploadNewFile(
     const std::string& directory_resource_id,
     const FilePath& local_file_path,
     const std::string& title,
     int64 file_size,
     const UploadFileCallback& callback) {
   DCHECK(CalledOnValidThread());
   drive_service_->GetResourceEntry(
       directory_resource_id,
-      base::Bind(&DriveFileSyncClient::DidGetResourceEntryData,
+      base::Bind(&DriveFileSyncClient::DidGetResourceEntry,
                  AsWeakPtr(),
                  base::Bind(&DriveFileSyncClient::UploadNewFileInternal,
                             AsWeakPtr(), local_file_path, title, file_size,
                             callback)));
 }
 
 void DriveFileSyncClient::UploadExistingFile(
     const std::string& resource_id,
     const std::string& remote_file_md5,
     const FilePath& local_file_path,
     int64 file_size,
     const UploadFileCallback& callback) {
   DCHECK(CalledOnValidThread());
   drive_service_->GetResourceEntry(
       resource_id,
-      base::Bind(&DriveFileSyncClient::DidGetResourceEntryData,
+      base::Bind(&DriveFileSyncClient::DidGetResourceEntry,
                  AsWeakPtr(),
                  base::Bind(&DriveFileSyncClient::UploadExistingFileInternal,
                             AsWeakPtr(), remote_file_md5, local_file_path,
                             file_size, callback)));
 }
 
 void DriveFileSyncClient::DeleteFile(
     const std::string& resource_id,
     const std::string& remote_file_md5,
     const GDataErrorCallback& callback) {
   DCHECK(CalledOnValidThread());
   drive_service_->GetResourceEntry(
       resource_id,
-      base::Bind(&DriveFileSyncClient::DidGetResourceEntryData,
+      base::Bind(&DriveFileSyncClient::DidGetResourceEntry,
                  AsWeakPtr(),
                  base::Bind(&DriveFileSyncClient::DeleteFileInternal,
                             AsWeakPtr(), remote_file_md5, callback)));
 }
 
 // static
 std::string DriveFileSyncClient::OriginToDirectoryTitle(const GURL& origin) {
   DCHECK(origin.SchemeIs(extensions::kExtensionScheme));
   return origin.host();
 }
@@ skipping 29 matching lines @@
 
   if (error != google_apis::HTTP_SUCCESS) {
     callback.Run(error, scoped_ptr<google_apis::ResourceList>());
     return;
   }
 
   DCHECK(resource_list);
   callback.Run(error, resource_list.Pass());
 }
 
-void DriveFileSyncClient::DidGetResourceEntryData(
+void DriveFileSyncClient::DidGetResourceEntry(
     const ResourceEntryCallback& callback,
     google_apis::GDataErrorCode error,
-    scoped_ptr<base::Value> data) {
+    scoped_ptr<google_apis::ResourceEntry> entry) {
   DCHECK(CalledOnValidThread());
 
   if (error != google_apis::HTTP_SUCCESS) {
     callback.Run(error, scoped_ptr<google_apis::ResourceEntry>());
     return;
   }
 
-  DCHECK(data);
-  scoped_ptr<google_apis::ResourceEntry> entry(
-      google_apis::ResourceEntry::ExtractAndParse(*data));
-  if (!entry)
-    error = google_apis::GDATA_PARSE_ERROR;
+  DCHECK(entry);
   callback.Run(error, entry.Pass());
 }
 
 // static
 std::string DriveFileSyncClient::FormatTitleQuery(const std::string& title) {
   // TODO(tzik): This pattern matches partial and case-insensitive,
   // and also matches files in subdirectories.
   // Refine the query after we migrate to Drive API.
   std::ostringstream out;
   out << "title:";
@@ skipping 191 matching lines @@
 }
 
 void DriveFileSyncClient::DidDeleteFile(
     const GDataErrorCallback& callback,
     google_apis::GDataErrorCode error) {
   DCHECK(CalledOnValidThread());
   callback.Run(error);
 }
 
 }  // namespace sync_file_system