google_apis: DriveServiceInterface::GetResourceEntry() returns ResourceEntry

chrome/browser/chromeos/drive/drive_file_system.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_file_system.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop_proxy.h"
@@ skipping 948 matching lines @@
   // - if we have enough space, start downloading the file from the server
   GetFileFromCacheParams params(in_params);
   params.cache_file_path = cache_file_path;
   drive_service_->GetResourceEntry(
       params.resource_id,
       base::Bind(&DriveFileSystem::OnGetResourceEntry,
                  ui_weak_ptr_,
                  params));
 }
 
-void DriveFileSystem::OnGetResourceEntry(const GetFileFromCacheParams& params,
-                                         google_apis::GDataErrorCode status,
-                                         scoped_ptr<base::Value> data) {
+void DriveFileSystem::OnGetResourceEntry(
+    const GetFileFromCacheParams& params,
+    google_apis::GDataErrorCode status,
+    scoped_ptr<google_apis::ResourceEntry> entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!params.get_file_callback.is_null());
 
   const DriveFileError error = util::GDataToDriveFileError(status);
   if (error != DRIVE_FILE_OK) {
     params.get_file_callback.Run(error,
                                  params.cache_file_path,
                                  params.mime_type,
                                  REGULAR_FILE);
     return;
   }
 
-  scoped_ptr<google_apis::ResourceEntry> entry;
-  if (!google_apis::util::IsDriveV2ApiEnabled()) {
-    entry = google_apis::ResourceEntry::ExtractAndParse(*data);
-  } else {
-    scoped_ptr<google_apis::FileResource> file_resource =
-        google_apis::FileResource::CreateFrom(*data);
-    entry = google_apis::ResourceEntry::CreateFromFileResource(
-        *file_resource);
-  }
-
   GURL content_url = entry->content_url();
   int64 file_size = entry->file_size();
 
   // The content URL can be empty for non-downloadable files (such as files
   // shared from others with "prevent downloading by viewers" flag set.)
   if (content_url.is_empty()) {
     params.get_file_callback.Run(DRIVE_FILE_ERROR_ACCESS_DENIED,
                                  params.cache_file_path,
                                  params.mime_type,
                                  REGULAR_FILE);
@@ skipping 1175 matching lines @@
     return;
   }
 
   PlatformFileInfoProto entry_file_info;
   util::ConvertPlatformFileInfoToProto(*file_info, &entry_file_info);
   *entry_proto->mutable_file_info() = entry_file_info;
   callback.Run(DRIVE_FILE_OK, entry_proto.Pass());
 }
 
 }  // namespace drive