Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Unified Diff: content/browser/browser_context.cc

Issue 1251243003: Support restricting browsing data removal for downloads by origin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Fix DownloadManager dependency injection and GMock matcher. Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/browser_context.cc
diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc
index a7394834cc21304a26293c7e56cc12a46e8e13ff..62d80536fb797c45dbf68dce8b8f80a37f1fd635 100644
--- a/content/browser/browser_context.cc
+++ b/content/browser/browser_context.cc
@@ -91,6 +91,16 @@ void ShutdownServiceWorkerContext(StoragePartition* partition) {
wrapper->process_manager()->Shutdown();
}
+void SetDownloadManager(BrowserContext* context,
+ content::DownloadManager* download_manager) {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(context);
+ DCHECK(download_manager);
+ context->SetUserData(
+ kDownloadManagerKeyName,
+ download_manager);
Charlie Reis 2015/08/03 18:33:19 style nit: This should all fit on one line.
+}
+
} // namespace
// static
@@ -121,9 +131,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 +315,11 @@ void BrowserContext::SaveSessionState(BrowserContext* browser_context) {
}
}
+void BrowserContext::SetDownloadManagerForTesting(
+ BrowserContext* browser_context, DownloadManager* download_manager) {
Charlie Reis 2015/08/03 18:33:19 Style nit: "For function declarations and definiti
+ SetDownloadManager(browser_context, download_manager);
+}
+
#endif // !OS_IOS
BrowserContext::~BrowserContext() {

Powered by Google App Engine
This is Rietveld 408576698