Download filename determination refactor (3/3)

chrome/browser/download/download_service.cc

 // 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.
 
 #include "chrome/browser/download/download_service.h"
 
 #include "base/callback.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_service_factory.h"
@@ skipping 17 matching lines @@
 void DownloadService::OnManagerCreated(
     const DownloadService::OnManagerCreatedCallback& cb) {
   if (download_manager_created_) {
     DownloadManager* dm = BrowserContext::GetDownloadManager(profile_);
     cb.Run(dm);
   } else {
     on_manager_created_callbacks_.push_back(cb);
   }
 }
 
-DownloadManagerDelegate* DownloadService::GetDownloadManagerDelegate() {
-  DCHECK(!download_manager_created_);
+ChromeDownloadManagerDelegate* DownloadService::GetDownloadManagerDelegate() {
+  DownloadManager* manager = BrowserContext::GetDownloadManager(profile_);
+  // If we've already created the delegate, just return it.
+  if (download_manager_created_) {
+    DCHECK(static_cast<DownloadManagerDelegate*>(manager_delegate_.get()) ==
+           manager->GetDelegate());
+    return manager_delegate_.get();
+  }
   download_manager_created_ = true;
 
   // In case the delegate has already been set by
   // SetDownloadManagerDelegateForTesting.
   if (!manager_delegate_.get())
     manager_delegate_ = new ChromeDownloadManagerDelegate(profile_);
 
-  DownloadManager* dm = BrowserContext::GetDownloadManager(profile_);
-  manager_delegate_->SetDownloadManager(dm);
+  manager_delegate_->SetDownloadManager(manager);
 
   // Include this download manager in the set monitored by the
   // global status updater.
-  g_browser_process->download_status_updater()->AddManager(dm);
+  g_browser_process->download_status_updater()->AddManager(manager);
 
   download_manager_created_ = true;
-  for (std::vector<OnManagerCreatedCallback>::iterator cb
-        = on_manager_created_callbacks_.begin();
-        cb != on_manager_created_callbacks_.end(); ++cb) {
-    cb->Run(dm);
+  for (std::vector<OnManagerCreatedCallback>::iterator cb =
+           on_manager_created_callbacks_.begin();
+       cb != on_manager_created_callbacks_.end(); ++cb) {
+    cb->Run(manager);
   }
   on_manager_created_callbacks_.clear();
 
   return manager_delegate_.get();
 }
 
 bool DownloadService::HasCreatedDownloadManager() {
   return download_manager_created_;
 }
 
@@ skipping 15 matching lines @@
     if ((*it)->HasOffTheRecordProfile())
       count += DownloadServiceFactory::GetForProfile(
           (*it)->GetOffTheRecordProfile())->DownloadCount();
   }
 
   return count;
 }
 
 void DownloadService::SetDownloadManagerDelegateForTesting(
     ChromeDownloadManagerDelegate* new_delegate) {
+  // Set the new delegate first so that if BrowserContext::GetDownloadManager()
+  // causes a new download manager to be created, we won't create a redundant
+  // ChromeDownloadManagerDelegate().
+  manager_delegate_ = new_delegate;
   // Guarantee everything is properly initialized.
   DownloadManager* dm = BrowserContext::GetDownloadManager(profile_);
-  dm->SetDelegate(new_delegate);
-  new_delegate->SetDownloadManager(dm);
-  manager_delegate_ = new_delegate;
+  if (dm->GetDelegate() != new_delegate) {
+    dm->SetDelegate(new_delegate);
+    new_delegate->SetDownloadManager(dm);
+  }
 }
 
 void DownloadService::Shutdown() {
   if (download_manager_created_) {
     // Normally the DownloadManager would be shutdown later, after the Profile
     // goes away and BrowserContext's destructor runs. But that would be too
     // late for us since we need to use the profile (indirectly through history
     // code) when the DownloadManager is shutting down. So we shut it down
     // manually earlier. See http://crbug.com/131692
     BrowserContext::GetDownloadManager(profile_)->Shutdown();
   }
   manager_delegate_ = NULL;
 }