Split DownloadFile::Rename into RenameAndUniquify and RenameAndAnnotate.

content/public/test/test_file_error_injector.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_PUBLIC_TEST_TEST_FILE_ERROR_INJECTOR_H_
 #define CONTENT_PUBLIC_TEST_TEST_FILE_ERROR_INJECTOR_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 37 matching lines @@
 //
 // download_manager->DownloadUrl(url1, ...);
 // download_manager->DownloadUrl(url2, ...);
 // ... wait for downloads to finish or get an injected error ...
 class TestFileErrorInjector
     : public base::RefCountedThreadSafe<TestFileErrorInjector> {
  public:
   enum FileOperationCode {
     FILE_OPERATION_INITIALIZE,
     FILE_OPERATION_WRITE,
-    FILE_OPERATION_RENAME
+    FILE_OPERATION_RENAME_UNIQUIFY,
+    FILE_OPERATION_RENAME_ANNOTATE,
   };
 
   // Structure that encapsulates the information needed to inject a file error.
   struct FileErrorInfo {
     std::string url;  // Full URL of the download.  Identifies the download.
     FileOperationCode code;  // Operation to affect.
     int operation_instance;  // 0-based count of operation calls, for each code.
     DownloadInterruptReason error;  // Error to inject.
   };
 
@@ skipping 71 matching lines @@
 
   // The download manager we set the factory on.
   scoped_refptr<DownloadManagerImpl> download_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(TestFileErrorInjector);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_TEST_FILE_ERROR_INJECTOR_H_