Move some Chrome-specific code paths out of DownloadManager and into the delegate. Getting rid of...

chrome/browser/profiles/profile.cc

 // Copyright (c) 2011 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 "chrome/browser/profiles/profile.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 446 matching lines @@
   virtual PrefService* GetOffTheRecordPrefs() {
     return prefs_;
   }
 
   virtual TemplateURLFetcher* GetTemplateURLFetcher() {
     return profile_->GetTemplateURLFetcher();
   }
 
   virtual DownloadManager* GetDownloadManager() {
     if (!download_manager_.get()) {
-      download_manager_delegate_.reset(new ChromeDownloadManagerDelegate());
+      download_manager_delegate_ = new ChromeDownloadManagerDelegate();
       scoped_refptr<DownloadManager> dlm(
-          new DownloadManager(download_manager_delegate_.get(),
+          new DownloadManager(download_manager_delegate_,
                               g_browser_process->download_status_updater()));
       download_manager_delegate_->set_download_manager(dlm);
       dlm->Init(this);
       download_manager_.swap(dlm);
     }
     return download_manager_.get();
   }
 
   virtual bool HasCreatedDownloadManager() const {
     return (download_manager_.get() != NULL);
@@ skipping 308 matching lines @@
 
   // Weak pointer owned by |profile_|.
   PrefService* prefs_;
 
   scoped_ptr<ExtensionProcessManager> extension_process_manager_;
 
   OffTheRecordProfileIOData::Handle io_data_;
 
   // Used so that Chrome code can influence how content module's DownloadManager
   // functions.
-  scoped_ptr<ChromeDownloadManagerDelegate> download_manager_delegate_;
+  scoped_refptr<ChromeDownloadManagerDelegate> download_manager_delegate_;
 
   // The download manager that only stores downloaded items in memory.
   scoped_refptr<DownloadManager> download_manager_;
 
   // We use a non-persistent content settings map for OTR.
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
 
   // Use a separate zoom map for OTR.
   scoped_refptr<HostZoomMap> host_zoom_map_;
 
@@ skipping 65 matching lines @@
 };
 #endif
 
 Profile* Profile::CreateOffTheRecordProfile() {
 #if defined(OS_CHROMEOS)
   if (Profile::IsGuestSession())
     return new GuestSessionProfile(this);
 #endif
   return new OffTheRecordProfileImpl(this);
 }