google_apis: DriveServiceInterface::GetResourceEntry() returns ResourceEntry

chrome/browser/chromeos/extensions/external_filesystem_apitest.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 "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 385 matching lines @@
       .WillOnce(MockGetResourceListCallback(google_apis::HTTP_SUCCESS,
                                             &resource_list));
 
   // When file browser tries to read the file, remote filesystem should detect
   // that the cached file is not present on the disk and download it. Mocked
   // download file will create file with the cached name and predetermined
   // content. This is the file file browser will read content from.
   // Later in the test, file handler will try to open the same file on gdata
   // mount point. This time, DownloadFile should not be called because local
   // copy is already present in the cache.
-  scoped_ptr<base::Value> document_to_download_value(
+  scoped_ptr<base::Value> file_to_download_value(
       LoadJSONFile(kTestDocumentToDownloadEntry));
+  scoped_ptr<google_apis::ResourceEntry> file_to_download(
+      google_apis::ResourceEntry::ExtractAndParse(*file_to_download_value));
   EXPECT_CALL(*mock_drive_service_,
               GetResourceEntry("file:1_file_resource_id", _))
       .WillOnce(MockGetResourceEntryCallback(google_apis::HTTP_SUCCESS,
-                                             &document_to_download_value));
+                                             &file_to_download));
 
   // We expect to download url defined in document entry returned by
   // GetResourceEntry mock implementation.
   EXPECT_CALL(*mock_drive_service_,
               DownloadFile(_, _, GURL("https://file_content_url_changed"),
                            _, _))
       .WillOnce(MockDownloadFileCallback(google_apis::HTTP_SUCCESS));
 
   // On exit, all operations in progress should be cancelled.
   EXPECT_CALL(*mock_drive_service_, CancelAll());
@@ skipping 38 matching lines @@
   scoped_ptr<base::Value> second_search_value(LoadJSONFile(kTestRootFeed));
   scoped_ptr<google_apis::ResourceList> second_search_list =
       google_apis::ResourceList::ExtractAndParse(*second_search_value);
 
   EXPECT_CALL(*mock_drive_service_,
               GetResourceList(GURL("https://next_feed"), _, "foo", _, _, _))
       .WillOnce(MockGetResourceListCallback(google_apis::HTTP_SUCCESS,
                                             &second_search_list));
 
   // Test will try to create a snapshot of the returned file.
-  scoped_ptr<base::Value> document_to_download_value(
+  scoped_ptr<base::Value> file_to_download_value(
       LoadJSONFile(kTestDocumentToDownloadEntry));
+  scoped_ptr<google_apis::ResourceEntry> file_to_download(
+      google_apis::ResourceEntry::ExtractAndParse(*file_to_download_value));
   EXPECT_CALL(*mock_drive_service_,
               GetResourceEntry("file:1_file_resource_id", _))
       .WillOnce(MockGetResourceEntryCallback(google_apis::HTTP_SUCCESS,
-                                             &document_to_download_value));
+                                             &file_to_download));
 
   // We expect to download url defined in document entry returned by
   // GetResourceEntry mock implementation.
   EXPECT_CALL(*mock_drive_service_,
               DownloadFile(_, _, GURL("https://file_content_url_changed"),
                            _, _))
       .WillOnce(MockDownloadFileCallback(google_apis::HTTP_SUCCESS));
 
   // On exit, all operations in progress should be cancelled.
   EXPECT_CALL(*mock_drive_service_, CancelAll());
 
   // All is set... RUN THE TEST.
   EXPECT_TRUE(RunExtensionSubtest("filebrowser_component", "remote_search.html",
       kComponentFlags)) << message_;
 }