Cleanup: Remote metadata parameter from ApplyLocalChange

chrome/browser/sync_file_system/sync_file_system_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 <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
@@ skipping 87 matching lines @@
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, base::Bind(arg1, operation_status));
 }
 
 ACTION_P(RecordState, states) {
   states->push_back(arg1);
 }
 
 ACTION_P(MockStatusCallback, status) {
   base::MessageLoopProxy::current()->PostTask(
-      FROM_HERE, base::Bind(arg4, status));
+      FROM_HERE, base::Bind(arg3, status));
 }
 
 ACTION_P3(MockSyncOperationCallback, status, url, operation_type) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE, base::Bind(arg1, status, url, operation_type));
 }
 
 class SyncFileSystemServiceTest : public testing::Test {
  protected:
   SyncFileSystemServiceTest() {}
@@ skipping 337 matching lines @@
   EXPECT_CALL(*mock_remote_service(), GetCurrentState())
       .Times(AtLeast(2))
       .WillRepeatedly(Return(REMOTE_SERVICE_OK));
   EXPECT_CALL(*mock_remote_service(), GetLocalChangeProcessor())
       .WillRepeatedly(Return(&local_change_processor));
 
   // The local_change_processor's ApplyLocalChange should be called once
   // with ADD_OR_UPDATE change for TYPE_FILE.
   const FileChange change(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
                           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_STATUS_OK));
 
   EXPECT_EQ(base::PLATFORM_FILE_OK, file_system_->CreateFile(kFile));
 
   run_loop.Run();
 }
 
 TEST_F(SyncFileSystemServiceTest, SimpleRemoteSyncFlow) {
   InitializeApp();
 
@@ skipping 44 matching lines @@
                                             fileapi::SYNC_OPERATION_NONE));
 
     // ProcessRemoteChange should be called again when the becomes
     // not busy.
     EXPECT_CALL(*mock_remote_service(), ProcessRemoteChange(_, _))
         .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
   }
 
   // We might also see an activity for local sync as we're going to make
   // a local write operation on kFile.
-  EXPECT_CALL(local_change_processor, ApplyLocalChange(_, _, _, kFile, _))
+  EXPECT_CALL(local_change_processor, ApplyLocalChange(_, _, kFile, _))
       .Times(AnyNumber());
 
   // This should trigger a remote sync.
   mock_remote_service()->NotifyRemoteChangeQueueUpdated(1);
 
   // Start a local operation on the same file (to make it BUSY).
   base::WaitableEvent event(false, false);
   thread_helper_.io_task_runner()->PostTask(
       FROM_HERE, base::Bind(&fileapi::CannedSyncableFileSystem::DoCreateFile,
                             base::Unretained(file_system_.get()),
@@ skipping 86 matching lines @@
         base::Bind(&AssignValueAndQuit<fileapi::SyncFileStatus>,
                    &run_loop, &status, &sync_file_status));
     run_loop.Run();
 
     EXPECT_EQ(fileapi::SYNC_STATUS_OK, status);
     EXPECT_EQ(fileapi::SYNC_FILE_STATUS_CONFLICTING, sync_file_status);
   }
 }
 
 }  // namespace sync_file_system