Split DownloadFile::Rename into RenameAndUniquify and RenameAndAnnotate.

content/browser/download/mock_download_file.h

 // 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.
 
 #ifndef CONTENT_BROWSER_DOWNLOAD_MOCK_DOWNLOAD_FILE_H_
 #define CONTENT_BROWSER_DOWNLOAD_MOCK_DOWNLOAD_FILE_H_
 
 #include <string>
 #include <map>
 
@@ skipping 11 matching lines @@
 class MockDownloadFile : virtual public DownloadFile {
  public:
   MockDownloadFile();
   virtual ~MockDownloadFile();
 
   // DownloadFile functions.
   MOCK_METHOD1(Initialize, void(const InitializeCallback&));
   MOCK_METHOD2(AppendDataToFile, DownloadInterruptReason(
       const char* data, size_t data_len));
   MOCK_METHOD1(Rename, DownloadInterruptReason(const FilePath& full_path));
-  MOCK_METHOD3(Rename, void(const FilePath& full_path,
-                            bool overwrite_existing_file,
-                            const RenameCompletionCallback& callback));
-  MOCK_METHOD1(Detach, void(const DetachCompletionCallback& callback));
+  MOCK_METHOD2(RenameAndUniquify,
+               void(const FilePath& full_path,
+                    const RenameCompletionCallback& callback));
+  MOCK_METHOD2(RenameAndAnnotate,
+               void(const FilePath& full_path,
+                    const RenameCompletionCallback& callback));
+  MOCK_METHOD0(Detach, void());
   MOCK_METHOD0(Cancel, void());
   MOCK_METHOD0(Finish, void());
   MOCK_CONST_METHOD0(FullPath, FilePath());
   MOCK_CONST_METHOD0(InProgress, bool());
   MOCK_CONST_METHOD0(BytesSoFar, int64());
   MOCK_CONST_METHOD0(CurrentSpeed, int64());
   MOCK_METHOD1(GetHash, bool(std::string* hash));
   MOCK_METHOD0(GetHashState, std::string());
   MOCK_METHOD0(SendUpdate, void());
   MOCK_CONST_METHOD0(Id, int());
   MOCK_METHOD0(GetDownloadManager, DownloadManager*());
   MOCK_CONST_METHOD0(GlobalId, const DownloadId&());
   MOCK_CONST_METHOD0(DebugString, std::string());
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_MOCK_DOWNLOAD_FILE_H_