Chromium Code Reviews| Index: content/browser/browser_context.cc |
| diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc |
| index a7394834cc21304a26293c7e56cc12a46e8e13ff..8e4f652a73e489d0ca255d25dfd23dcb454ab06a 100644 |
| --- a/content/browser/browser_context.cc |
| +++ b/content/browser/browser_context.cc |
| @@ -91,6 +91,14 @@ void ShutdownServiceWorkerContext(StoragePartition* partition) { |
| wrapper->process_manager()->Shutdown(); |
| } |
| +void SetDownloadManager(BrowserContext* context, |
| + content::DownloadManager* download_manager) { |
| + DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| + DCHECK(context); |
|
Charlie Reis
2015/08/05 22:19:19
This one seems optional, since we'll crash on line
Timo Reimann
2015/08/06 01:13:45
I'm fine with removing it. Done.
|
| + DCHECK(download_manager); |
| + context->SetUserData(kDownloadManagerKeyName, download_manager); |
| +} |
| + |
| } // namespace |
| // static |
| @@ -121,9 +129,7 @@ DownloadManager* BrowserContext::GetDownloadManager( |
| new DownloadManagerImpl( |
| GetContentClient()->browser()->GetNetLog(), context); |
| - context->SetUserData( |
| - kDownloadManagerKeyName, |
| - download_manager); |
| + SetDownloadManager(context, download_manager); |
| download_manager->SetDelegate(context->GetDownloadManagerDelegate()); |
| } |
| @@ -307,6 +313,12 @@ void BrowserContext::SaveSessionState(BrowserContext* browser_context) { |
| } |
| } |
| +void BrowserContext::SetDownloadManagerForTesting( |
| + BrowserContext* browser_context, |
| + DownloadManager* download_manager) { |
| + SetDownloadManager(browser_context, download_manager); |
| +} |
| + |
| #endif // !OS_IOS |
| BrowserContext::~BrowserContext() { |