google_apis: DriveServiceInterface::GetResourceEntry() returns ResourceEntry

chrome/browser/chromeos/drive/drive_file_system.cc

Index: chrome/browser/chromeos/drive/drive_file_system.cc
diff --git a/chrome/browser/chromeos/drive/drive_file_system.cc b/chrome/browser/chromeos/drive/drive_file_system.cc
index 6ece3d8319cc5d002a1e36781d61dfb5ad577e27..e6df5d6eb542f88e056063f362056db16fe16e47 100644
--- a/chrome/browser/chromeos/drive/drive_file_system.cc
+++ b/chrome/browser/chromeos/drive/drive_file_system.cc
@@ -966,9 +966,10 @@ void DriveFileSystem::OnGetFileFromCache(
                  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());
 
@@ -981,16 +982,6 @@ void DriveFileSystem::OnGetResourceEntry(const GetFileFromCacheParams& params,
     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();