drive: Remove DriveFileType

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 13 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::StrictMock;
 using ::testing::_;
 
 namespace drive {
 
 namespace {
 
 // Action used to set mock expectations for GetFileByResourceId().
-ACTION_P4(MockGetFileByResourceId, error, local_path, mime_type, file_type) {
-  arg2.Run(error, local_path, mime_type, file_type);
+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) {
   scoped_ptr<ResourceEntry> entry(new ResourceEntry);
@@ skipping 105 matching lines @@
   }
 
   // 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, _, _, _))
         .WillOnce(
             MockGetFileByResourceId(
                 FILE_ERROR_OK,
-                base::FilePath::FromUTF8Unsafe("local_path_does_not_matter"),
-                std::string("mime_type_does_not_matter"),
-                REGULAR_FILE));
+                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, _, _))
         .WillOnce(MockUpdateFileByResourceId(FILE_ERROR_OK));
   }
@@ skipping 113 matching lines @@
   // Start checking the existing pinned files. This will collect the resource
   // IDs of pinned files, with stale local cache files.
   sync_client_->StartCheckingExistingPinnedFiles();
 
   SetExpectationForGetFileByResourceId("resource_id_fetched");
 
   google_apis::test_util::RunBlockingPoolTask();
 }
 
 }  // namespace drive