drive: Stop returning FilePath from GetResourceEntryById

chrome/browser/chromeos/drive/sync_client_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/sync_client.h"
 
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 23 matching lines @@
 // Action used to set mock expectations for GetFileByResourceId().
 ACTION_P2(MockGetFileByResourceId, error, local_path) {
   arg2.Run(error, local_path, scoped_ptr<ResourceEntry>(new ResourceEntry));
 }
 
 // Action used to set mock expectations for UpdateFileByResourceId().
 ACTION_P(MockUpdateFileByResourceId, error) {
   arg2.Run(error);
 }
 
-// Action used to set mock expectations for GetFileInfoByResourceId().
-ACTION_P2(MockUpdateFileByResourceId, error, md5) {
+// Action used to set mock expectations for GetResourceEntryById().
+ACTION_P2(MockGetResourceEntryById, error, md5) {
   scoped_ptr<ResourceEntry> entry(new ResourceEntry);
   entry->mutable_file_specific_info()->set_file_md5(md5);
-  arg1.Run(error, base::FilePath(), entry.Pass());
+  arg1.Run(error, entry.Pass());
 }
 
 }  // namespace
 
 class SyncClientTest : public testing::Test {
  public:
   SyncClientTest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_),
         mock_file_system_(new StrictMock<MockFileSystem>) {
   }
@@ skipping 95 matching lines @@
     cache_->CommitDirtyOnUIThread(
         resource_id_dirty, md5_dirty,
         google_apis::test_util::CreateCopyResultCallback(&error));
     google_apis::test_util::RunBlockingPoolTask();
     EXPECT_EQ(FILE_ERROR_OK, error);
   }
 
   // Sets the expectation for MockFileSystem::GetFileByResourceId(),
   // that simulates successful retrieval of a file for the given resource ID.
   void SetExpectationForGetFileByResourceId(const std::string& resource_id) {
-    EXPECT_CALL(*mock_file_system_,
-                GetFileByResourceId(resource_id, _, _, _))
+    EXPECT_CALL(*mock_file_system_, GetFileByResourceId(resource_id, _, _, _))
         .WillOnce(
             MockGetFileByResourceId(
                 FILE_ERROR_OK,
                 base::FilePath::FromUTF8Unsafe("local_path_does_not_matter")));
   }
 
   // Sets the expectation for MockFileSystem::UpdateFileByResourceId(),
   // that simulates successful uploading of a file for the given resource ID.
-  void SetExpectationForUpdateFileByResourceId(
-      const std::string& resource_id) {
-    EXPECT_CALL(*mock_file_system_,
-                UpdateFileByResourceId(resource_id, _, _))
+  void SetExpectationForUpdateFileByResourceId(const std::string& resource_id) {
+    EXPECT_CALL(*mock_file_system_, UpdateFileByResourceId(resource_id, _, _))
         .WillOnce(MockUpdateFileByResourceId(FILE_ERROR_OK));
   }
 
-  // Sets the expectation for MockFileSystem::GetFileInfoByResourceId(),
+  // Sets the expectation for MockFileSystem::GetResourceEntryById(),
   // that simulates successful retrieval of file info for the given resource
   // ID.
   //
   // This is used for testing StartCheckingExistingPinnedFiles(), hence we
   // are only interested in the MD5 value in ResourceEntry.
-  void SetExpectationForGetFileInfoByResourceId(
-      const std::string& resource_id,
-      const std::string& new_md5) {
-    EXPECT_CALL(*mock_file_system_,
-                GetResourceEntryById(resource_id, _))
-        .WillOnce(MockUpdateFileByResourceId(
-            FILE_ERROR_OK,
-            new_md5));
+  void SetExpectationForGetFileInfoByResourceId(const std::string& resource_id,
+                                                const std::string& new_md5) {
+    EXPECT_CALL(*mock_file_system_, GetResourceEntryById(resource_id, _))
+        .WillOnce(MockGetResourceEntryById(FILE_ERROR_OK, new_md5));
   }
 
   // Returns the resource IDs in the queue to be fetched.
   std::vector<std::string> GetResourceIdsToBeFetched() {
     return sync_client_->GetResourceIdsForTesting(SyncClient::FETCH);
   }
 
   // Returns the resource IDs in the queue to be uploaded.
   std::vector<std::string> GetResourceIdsToBeUploaded() {
     return sync_client_->GetResourceIdsForTesting(SyncClient::UPLOAD);
@@ skipping 89 matching lines @@
   // IDs of pinned files, with stale local cache files.
   sync_client_->StartCheckingExistingPinnedFiles();
 
   SetExpectationForGetFileByResourceId("resource_id_fetched");
 
   google_apis::test_util::RunBlockingPoolTask();
 }
 
 }  // namespace internal
 }  // namespace drive