Split DownloadFile::Rename into RenameAndUniquify and RenameAndAnnotate.

content/shell/shell_download_manager_delegate.h

Index: content/shell/shell_download_manager_delegate.h
diff --git a/content/shell/shell_download_manager_delegate.h b/content/shell/shell_download_manager_delegate.h
index e201025ad5492d7d3e1d06aab39bf78b74ccb6c0..3d75eac15c15f15b8b208c5dcf337dd9d95ee955 100644
--- a/content/shell/shell_download_manager_delegate.h
+++ b/content/shell/shell_download_manager_delegate.h
@@ -31,10 +31,13 @@ class ShellDownloadManagerDelegate
   void SetDownloadBehaviorForTesting(
       const FilePath& default_download_path);
 
+ protected:
+  // To allow subclasses for testing.
+  virtual ~ShellDownloadManagerDelegate();

[jochen (gone - plz use gerrit), 2012/11/07 21:58:48]

why not just friend the test?

[Randy Smith (Not in Mondays), 2012/11/07 22:24:55]

Huh.  My inclination is against, partially because it doesn't scale (in theory,
several tests could want to inherit from SDMD) and partially because the test in
question doesn't really have anything to do with SDMS, so it isn't clear to me
that the SDMD should have to know about it.  This seems better.  But if you feel
strongly (or evenly moderately; I don't have any sense of ownership of the SDMD
code), I'll change it.

+
  private:
   friend class base::RefCountedThreadSafe<ShellDownloadManagerDelegate>;
 
-  virtual ~ShellDownloadManagerDelegate();
 
   void GenerateFilename(int32 download_id,
                         const DownloadTargetCallback& callback,