Followup comments from r140761 regarding moving DownloadManager ownership to content.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/10545034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140780 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 6 insertions, 5 deletions

diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
index 9f3ec30..8049730 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -133,7 +133,7 @@ DownloadId ChromeDownloadManagerDelegate::GetNextId() {
     return DownloadId(this, next_download_id_++);
 
   return BrowserContext::GetDownloadManager(profile_->GetOriginalProfile())->
-      delegate()->GetNextId();
+      GetDelegate()->GetNextId();
 }
 
 bool ChromeDownloadManagerDelegate::ShouldStartDownload(int32 download_id) {
diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc
index 1941c47..bc8a396 100644
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -111,7 +111,8 @@ void DownloadPrefs::RegisterUserPrefs(PrefService* prefs) {
 DownloadPrefs* DownloadPrefs::FromDownloadManager(
     DownloadManager* download_manager) {
   ChromeDownloadManagerDelegate* delegate =
-      static_cast<ChromeDownloadManagerDelegate*>(download_manager->delegate());
+      static_cast<ChromeDownloadManagerDelegate*>(
+          download_manager->GetDelegate());
   return delegate->download_prefs();
 }
 
diff --git a/chrome/browser/download/download_service.cc b/chrome/browser/download/download_service.cc
index 278fac4..ef5ccc3 100644
--- a/chrome/browser/download/download_service.cc
+++ b/chrome/browser/download/download_service.cc
@@ -27,8 +27,8 @@ DownloadService::~DownloadService() {}
 
 void DownloadService::OnManagerCreated(
     const DownloadService::OnManagerCreatedCallback& cb) {
-  DownloadManager* dm = BrowserContext::GetDownloadManager(profile_);
   if (download_manager_created_) {
+    DownloadManager* dm = BrowserContext::GetDownloadManager(profile_);
     cb.Run(dm);
   } else {
     on_manager_created_callbacks_.push_back(cb);
@@ -92,7 +92,7 @@ void DownloadService::SetDownloadManagerDelegateForTesting(
     ChromeDownloadManagerDelegate* new_delegate) {
   // Guarantee everything is properly initialized.
   DownloadManager* dm = BrowserContext::GetDownloadManager(profile_);
-  dm->SetDownloadManagerDelegate(new_delegate);
+  dm->SetDelegate(new_delegate);
   new_delegate->SetDownloadManager(dm);
   manager_delegate_ = new_delegate;
 }
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index ec727d1..0b48c82 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -125,7 +125,7 @@ class SavePageBrowserTest : public InProcessBrowserTest {
     // Query the history system.
     ChromeDownloadManagerDelegate* delegate =
       static_cast<ChromeDownloadManagerDelegate*>(
-          GetDownloadManager()->delegate());
+          GetDownloadManager()->GetDelegate());
     delegate->download_history()->Load(
         base::Bind(&SavePageBrowserTest::OnQueryDownloadEntriesComplete,
                    base::Unretained(this)));