Split DownloadFile::Rename into RenameAndUniquify and RenameAndAnnotate.

content/shell/shell_download_manager_delegate.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_SHELL_SHELL_DOWNLOAD_MANAGER_DELEGATE_H_
 #define CONTENT_SHELL_SHELL_DOWNLOAD_MANAGER_DELEGATE_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "content/public/browser/download_manager_delegate.h"
@@ skipping 13 matching lines @@
   virtual void Shutdown() OVERRIDE;
   virtual bool DetermineDownloadTarget(
       DownloadItem* download,
       const DownloadTargetCallback& callback) OVERRIDE;
   virtual void AddItemToPersistentStore(DownloadItem* item) OVERRIDE;
 
   // Inhibits prompting and sets the default download path.
   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,
                         const FilePath& generated_name,
                         const FilePath& suggested_directory);
   void OnDownloadPathGenerated(int32 download_id,
                                const DownloadTargetCallback& callback,
                                const FilePath& suggested_path);
   void ChooseDownloadPath(int32 download_id,
                           const DownloadTargetCallback& callback,
                           const FilePath& suggested_path);
 
   DownloadManager* download_manager_;
   FilePath default_download_path_;
   bool suppress_prompting_;
   int64 last_download_db_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellDownloadManagerDelegate);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_SHELL_DOWNLOAD_MANAGER_DELEGATE_H_