Cleanup: Remote metadata parameter from ApplyLocalChange

chrome/browser/sync_file_system/local_file_sync_service_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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
 #include "base/run_loop.h"
@@ skipping 71 matching lines @@
                        SyncStatusCode status,
                        const SyncFileMetadata& metadata) {
   SCOPED_TRACE(testing::Message() << where.ToString());
   *status_out = status;
   *metadata_out = metadata;
   oncompleted.Run();
 }
 
 ACTION_P(MockStatusCallback, status) {
   base::MessageLoopProxy::current()->PostTask(
-      FROM_HERE, base::Bind(arg4, status));
+      FROM_HERE, base::Bind(arg3, status));
 }
 
 ACTION_P2(MockStatusCallbackAndRecordChange, status, changes) {
   base::MessageLoopProxy::current()->PostTask(
-      FROM_HERE, base::Bind(arg4, status));
+      FROM_HERE, base::Bind(arg3, status));
   changes->push_back(arg0);
 }
 
 }  // namespace
 
 class LocalFileSyncServiceTest
     : public testing::Test,
       public LocalFileSyncService::Observer {
  protected:
   LocalFileSyncServiceTest() : num_changes_(0) {}
@@ skipping 214 matching lines @@
   StrictMock<MockSyncStatusObserver> status_observer;
   EXPECT_CALL(status_observer, OnSyncEnabled(kFile))
       .Times(AtLeast(1));
   file_system_->AddSyncStatusObserver(&status_observer);
 
   // Creates and writes into a file.
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->CreateFile(kFile));
   EXPECT_EQ(kTestFileDataSize,
             file_system_->WriteString(kFile, std::string(kTestFileData)));
 
-  // Retrieve the file metadata to set up the expected values.
+  // Retrieve the expected platform_path.
   base::PlatformFileInfo info;
   FilePath platform_path;
   EXPECT_EQ(base::PLATFORM_FILE_OK,
             file_system_->GetMetadata(kFile, &info, &platform_path));
 
-  ASSERT_FALSE(info.is_directory);
-  ASSERT_EQ(kTestFileDataSize, info.size);
-
-  fileapi::SyncFileMetadata metadata;
-  metadata.file_type = fileapi::SYNC_FILE_TYPE_FILE;
-  metadata.size = info.size;
-  metadata.last_modified = info.last_modified;
-
   // The local_change_processor's ApplyLocalChange should be called once
   // with ADD_OR_UPDATE change for TYPE_FILE.
   StrictMock<MockLocalChangeProcessor> local_change_processor;
   const FileChange change(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
                           fileapi::SYNC_FILE_TYPE_FILE);
   EXPECT_CALL(local_change_processor,
-              ApplyLocalChange(change, platform_path, metadata, kFile, _))
+              ApplyLocalChange(change, platform_path, kFile, _))
       .WillOnce(MockStatusCallback(fileapi::SYNC_STATUS_OK));
 
   local_service_->ProcessLocalChange(
       &local_change_processor,
       base::Bind(&OnSyncCompleted, FROM_HERE, run_loop.QuitClosure(),
                  fileapi::SYNC_STATUS_OK, kFile));
 
   run_loop.Run();
 
   file_system_->RemoveSyncStatusObserver(&status_observer);
@@ skipping 16 matching lines @@
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->CreateFile(kFile));
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->Remove(kFile, false));
 
   // The local_change_processor's ApplyLocalChange should be called once
   // with DELETE change for TYPE_FILE.
   // The file will NOT exist in the remote side and the processor might
   // return SYNC_FILE_ERROR_NOT_FOUND (as mocked).
   StrictMock<MockLocalChangeProcessor> local_change_processor;
   const FileChange change(FileChange::FILE_CHANGE_DELETE,
                           fileapi::SYNC_FILE_TYPE_FILE);
-  EXPECT_CALL(local_change_processor, ApplyLocalChange(change, _, _, kFile, _))
+  EXPECT_CALL(local_change_processor, ApplyLocalChange(change, _, kFile, _))
       .WillOnce(MockStatusCallback(fileapi::SYNC_FILE_ERROR_NOT_FOUND));
 
   // The sync should succeed anyway.
   local_service_->ProcessLocalChange(
       &local_change_processor,
       base::Bind(&OnSyncCompleted, FROM_HERE, run_loop.QuitClosure(),
                  fileapi::SYNC_STATUS_OK, kFile));
 
   run_loop.Run();
 
@@ skipping 50 matching lines @@
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->Remove(kPath, false));
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->CreateDirectory(kPath));
 
   // Creates one more file.
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->CreateFile(kOther));
 
   // The local_change_processor's ApplyLocalChange will be called
   // twice for FILE_TYPE and FILE_DIRECTORY.
   StrictMock<MockLocalChangeProcessor> local_change_processor;
   std::vector<FileChange> changes;
-  EXPECT_CALL(local_change_processor, ApplyLocalChange(_, _, _, kPath, _))
+  EXPECT_CALL(local_change_processor, ApplyLocalChange(_, _, kPath, _))
       .Times(2)
       .WillOnce(MockStatusCallbackAndRecordChange(fileapi::SYNC_STATUS_OK,
                                                   &changes))
       .WillOnce(MockStatusCallbackAndRecordChange(fileapi::SYNC_STATUS_OK,
                                                   &changes));
 
   local_service_->ProcessLocalChange(
       &local_change_processor,
       base::Bind(&OnSyncCompleted, FROM_HERE, run_loop.QuitClosure(),
                  fileapi::SYNC_STATUS_OK, kPath));
@@ skipping 68 matching lines @@
   }
 
   EXPECT_EQ(1, GetNumChangesInTracker());
   file_system_->GetChangedURLsInTracker(&urlset);
   EXPECT_EQ(1U, urlset.size());
   EXPECT_TRUE(urlset.find(kURL) != urlset.end());
 
   // Next local sync should pick up the recorded change.
   StrictMock<MockLocalChangeProcessor> local_change_processor;
   std::vector<FileChange> changes;
-  EXPECT_CALL(local_change_processor, ApplyLocalChange(_, _, _, kURL, _))
+  EXPECT_CALL(local_change_processor, ApplyLocalChange(_, _, kURL, _))
       .WillOnce(MockStatusCallbackAndRecordChange(fileapi::SYNC_STATUS_OK,
                                                   &changes));
   {
     base::RunLoop run_loop;
     local_service_->ProcessLocalChange(
         &local_change_processor,
         base::Bind(&OnSyncCompleted, FROM_HERE, run_loop.QuitClosure(),
                    fileapi::SYNC_STATUS_OK, kURL));
     run_loop.Run();
   }
 
   EXPECT_EQ(1U, changes.size());
   EXPECT_EQ(change, changes[0]);
 }
 
 // TODO(kinuko): Add tests for multiple file changes and multiple
 // FileSystemContexts.
 
 }  // namespace sync_file_system