DownloadManager intereface refactoring to allow cleaner DownloadItem unit tests.

chrome/browser/download/download_prefs.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/download/download_prefs.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_extensions.h"
+#include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/download/download_manager.h"
 #include "content/browser/download/save_package.h"
 #include "content/public/browser/browser_thread.h"
+#include "chrome/browser/download/download_service_factory.h"
 
 using content::BrowserThread;
 
 DownloadPrefs::DownloadPrefs(PrefService* prefs) : prefs_(prefs) {
   prompt_for_download_.Init(prefs::kPromptForDownload, prefs, NULL);
   download_path_.Init(prefs::kDownloadDefaultDirectory, prefs, NULL);
   save_file_type_.Init(prefs::kSaveFileType, prefs, NULL);
 
   // We store any file extension that should be opened automatically at
   // download completion in this pref.
@@ skipping 62 matching lines @@
 }
 
 // static
 DownloadPrefs* DownloadPrefs::FromDownloadManager(
     DownloadManager* download_manager) {
   ChromeDownloadManagerDelegate* delegate =
       static_cast<ChromeDownloadManagerDelegate*>(download_manager->delegate());
   return delegate->download_prefs();
 }
 
+// static
+DownloadPrefs* DownloadPrefs::FromBrowserContext(
+    content::BrowserContext* browser_context) {
+  Profile* profile = static_cast<Profile*>(browser_context);
+  DownloadService* download_service =
+      DownloadServiceFactory::GetForProfile(profile);
+  ChromeDownloadManagerDelegate* delegate =

[ahendrickson, 2011/11/29 21:40:15]

This part should call FromDownloadManager().

[Randy Smith (Not in Mondays), 2011/11/30 22:44:05]

Ok, but long term I want to get DownloadManager out of this pathway.  But then,
long-term I'd like to nuke this pathway, so that may be moot :-}.

+      static_cast<ChromeDownloadManagerDelegate*>(
+          download_service->GetDownloadManager()->delegate());
+  return delegate->download_prefs();
+}
+
 bool DownloadPrefs::PromptForDownload() const {
   // If the DownloadDirectory policy is set, then |prompt_for_download_| should
   // always be false.
   DCHECK(!download_path_.IsManaged() || !prompt_for_download_.GetValue());
   return *prompt_for_download_;
 }
 
 bool DownloadPrefs::IsDownloadPathManaged() const {
   return download_path_.IsManaged();
 }
@@ skipping 50 matching lines @@
     extensions.erase(extensions.size() - 1);
 
   prefs_->SetString(prefs::kDownloadExtensionsToOpen, extensions);
 }
 
 bool DownloadPrefs::AutoOpenCompareFunctor::operator()(
     const FilePath::StringType& a,
     const FilePath::StringType& b) const {
   return FilePath::CompareLessIgnoreCase(a, b);
 }