google_apis: DriveServiceInterface::GetResourceEntry() returns ResourceEntry

chrome/browser/chromeos/drive/drive_file_system_unittest.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 <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 66 matching lines @@
               results->at(i).is_directory);
   }
 
   EXPECT_EQ(expected_next_feed, next_feed);
 
   message_loop->Quit();
 }
 
 // Action used to set mock expectations for
 // DriveServiceInterface::GetResourceEntry().
-ACTION_P2(MockGetResourceEntry, status, value) {
+ACTION_P2(MockGetResourceEntry, status, entry) {
   base::MessageLoopProxy::current()->PostTask(FROM_HERE,
-      base::Bind(arg1, status, base::Passed(value)));
+      base::Bind(arg1, status, entry));
 }
 
 // Action used to set mock expectations for
 // DriveFileSystem::CopyHostedDocument().
 ACTION_P2(MockCopyHostedDocument, status, value) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(arg2, status, base::Passed(value)));
 }
 
@@ skipping 512 matching lines @@
       FilePath target_path;
       EXPECT_TRUE(file_util::ReadSymbolicLink(symlink_path, &target_path));
       EXPECT_TRUE(target_path.value() != kSymLinkToDevNull);
       if (test_util::ToCacheEntry(expected_cache_state_).is_present())
         EXPECT_EQ(dest_path, target_path);
     } else {
       EXPECT_FALSE(exists);
     }
   }
 
-  void SetExpectationsForGetResourceEntry(scoped_ptr<base::Value>* document,
+  void SetExpectationsForGetResourceEntry(const base::Value& value,
                                           const std::string& resource_id) {
+    scoped_ptr<google_apis::ResourceEntry> entry =
+        google_apis::ResourceEntry::ExtractAndParse(value);
     EXPECT_CALL(*mock_drive_service_, GetResourceEntry(resource_id, _))
-        .WillOnce(MockGetResourceEntry(google_apis::HTTP_SUCCESS, document));
+        .WillOnce(MockGetResourceEntry(google_apis::HTTP_SUCCESS,
+                                       base::Passed(&entry)));
   }
 
   // Loads serialized proto file from GCache, and makes sure the root
   // filesystem has a root at 'drive'
   bool TestLoadMetadataFromCache() {
     DriveFileError error = DRIVE_FILE_ERROR_FAILED;
     file_system_->LoadRootFeedFromCacheForTesting(
         base::Bind(&test_util::CopyErrorCodeFromFileOperationCallback, &error));
     google_apis::test_util::RunBlockingPoolTask();
     return error == DRIVE_FILE_OK;
@@ skipping 759 matching lines @@
   EXPECT_CALL(*mock_free_disk_space_checker_, AmountOfFreeDiskSpace())
       .Times(2).WillRepeatedly(Return(file_size + kMinFreeSpace));
 
   const std::string remote_src_file_data = "Test file data";
   mock_drive_service_->set_file_data(new std::string(remote_src_file_data));
 
   // Before Download starts metadata from server will be fetched.
   // We will read content url from the result.
   scoped_ptr<base::Value> document =
       google_apis::test_util::LoadJSONFile("gdata/document_to_download.json");
-  SetExpectationsForGetResourceEntry(&document, "file:2_file_resource_id");
+  SetExpectationsForGetResourceEntry(*document, "file:2_file_resource_id");
 
   // The file is obtained with the mock DriveService.
   EXPECT_CALL(*mock_drive_service_,
               DownloadFile(remote_src_file_path,
                            cache_file,
                            GURL("https://file_content_url_changed/"),
                            _, _))
       .Times(1);
 
   file_system_->TransferFileFromRemoteToLocal(
@@ skipping 595 matching lines @@
   const int64 file_size = entry_proto->file_info().size();
 
   // Pretend we have enough space.
   EXPECT_CALL(*mock_free_disk_space_checker_, AmountOfFreeDiskSpace())
       .Times(2).WillRepeatedly(Return(file_size + kMinFreeSpace));
 
   // Before Download starts metadata from server will be fetched.
   // We will read content url from the result.
   scoped_ptr<base::Value> document =
       google_apis::test_util::LoadJSONFile("gdata/document_to_download.json");
-  SetExpectationsForGetResourceEntry(&document, "file:2_file_resource_id");
+  SetExpectationsForGetResourceEntry(*document, "file:2_file_resource_id");
 
   // The file is obtained with the mock DriveService.
   EXPECT_CALL(*mock_drive_service_,
               DownloadFile(file_in_root,
                            downloaded_file,
                            GURL("https://file_content_url_changed/"),
                            _, _))
       .Times(1);
 
   file_system_->GetFileByPath(file_in_root, callback,
@@ skipping 20 matching lines @@
       entry_proto->file_specific_info().file_md5());
 
   // Pretend we have no space at all.
   EXPECT_CALL(*mock_free_disk_space_checker_, AmountOfFreeDiskSpace())
       .Times(2).WillRepeatedly(Return(0));
 
   // Before Download starts metadata from server will be fetched.
   // We will read content url from the result.
   scoped_ptr<base::Value> document =
       google_apis::test_util::LoadJSONFile("gdata/document_to_download.json");
-  SetExpectationsForGetResourceEntry(&document, "file:2_file_resource_id");
+  SetExpectationsForGetResourceEntry(*document, "file:2_file_resource_id");
 
   // The file is not obtained with the mock DriveService, because of no space.
   EXPECT_CALL(*mock_drive_service_,
               DownloadFile(file_in_root,
                            downloaded_file,
                            GURL("https://file_content_url_changed/"),
                            _, _))
       .Times(0);
 
   file_system_->GetFileByPath(file_in_root, callback,
@@ skipping 35 matching lines @@
                    DRIVE_FILE_OK,
                    test_util::TEST_CACHE_STATE_PRESENT,
                    DriveCache::CACHE_TYPE_TMP);
   ASSERT_TRUE(CacheEntryExists("<resource_id>", "<md5>"));
   ASSERT_TRUE(CacheFileExists("<resource_id>", "<md5>"));
 
   // Before Download starts metadata from server will be fetched.
   // We will read content url from the result.
   scoped_ptr<base::Value> document =
       google_apis::test_util::LoadJSONFile("gdata/document_to_download.json");
-  SetExpectationsForGetResourceEntry(&document, "file:2_file_resource_id");
+  SetExpectationsForGetResourceEntry(*document, "file:2_file_resource_id");
 
   // The file is obtained with the mock DriveService, because of we freed up the
   // space.
   EXPECT_CALL(*mock_drive_service_,
               DownloadFile(file_in_root,
                            downloaded_file,
                            GURL("https://file_content_url_changed/"),
                            _, _))
       .Times(1);
 
@@ skipping 32 matching lines @@
   // (ex. the actual file was larger than the expected size).
   EXPECT_CALL(*mock_free_disk_space_checker_, AmountOfFreeDiskSpace())
       .WillOnce(Return(file_size + kMinFreeSpace))
       .WillOnce(Return(kMinFreeSpace - 1))
       .WillOnce(Return(kMinFreeSpace - 1));
 
   // Before Download starts metadata from server will be fetched.
   // We will read content url from the result.
   scoped_ptr<base::Value> document =
       google_apis::test_util::LoadJSONFile("gdata/document_to_download.json");
-  SetExpectationsForGetResourceEntry(&document, "file:2_file_resource_id");
+  SetExpectationsForGetResourceEntry(*document, "file:2_file_resource_id");
 
   // The file is obtained with the mock DriveService.
   EXPECT_CALL(*mock_drive_service_,
               DownloadFile(file_in_root,
                            downloaded_file,
                            GURL("https://file_content_url_changed/"),
                            _, _))
       .Times(1);
 
   file_system_->GetFileByPath(file_in_root, callback,
@@ skipping 86 matching lines @@
   FilePath file_in_root(FILE_PATH_LITERAL("drive/File 1.txt"));
   scoped_ptr<DriveEntryProto> entry_proto(GetEntryInfoByPathSync(file_in_root));
   FilePath downloaded_file = GetCachePathForFile(
       entry_proto->resource_id(),
       entry_proto->file_specific_info().file_md5());
 
   // Before Download starts metadata from server will be fetched.
   // We will read content url from the result.
   scoped_ptr<base::Value> document =
       google_apis::test_util::LoadJSONFile("gdata/document_to_download.json");
-  SetExpectationsForGetResourceEntry(&document, "file:2_file_resource_id");
+  SetExpectationsForGetResourceEntry(*document, "file:2_file_resource_id");
 
   // The file is obtained with the mock DriveService, because it's not stored in
   // the cache.
   EXPECT_CALL(*mock_drive_service_,
               DownloadFile(file_in_root,
                            downloaded_file,
                            GURL("https://file_content_url_changed/"),
                            _, _))
       .Times(1);
 
@@ skipping 326 matching lines @@
   EXPECT_CALL(*mock_free_disk_space_checker_, AmountOfFreeDiskSpace())
       .Times(2).WillRepeatedly(Return(file_size + kMinFreeSpace));
 
   const std::string kExpectedFileData = "test file data";
   mock_drive_service_->set_file_data(new std::string(kExpectedFileData));
 
   // Before Download starts metadata from server will be fetched.
   // We will read content url from the result.
   scoped_ptr<base::Value> document =
       google_apis::test_util::LoadJSONFile("gdata/document_to_download.json");
-  SetExpectationsForGetResourceEntry(&document, "file:2_file_resource_id");
+  SetExpectationsForGetResourceEntry(*document, "file:2_file_resource_id");
 
   // The file is obtained with the mock DriveService.
   EXPECT_CALL(*mock_drive_service_,
               DownloadFile(kFileInRoot,
                            downloaded_file,
                            GURL("https://file_content_url_changed/"),
                            _, _))
       .Times(1);
 
   // Open kFileInRoot ("drive/File 1.txt").
@@ skipping 36 matching lines @@
 
   // Try to close the same file twice.
   file_system_->CloseFile(kFileInRoot, close_file_callback);
   message_loop_.Run();
 
   // It must fail.
   EXPECT_EQ(DRIVE_FILE_ERROR_NOT_FOUND, callback_helper_->last_error_);
 }
 
 }   // namespace drive