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

Unified Diff: content/browser/cache_storage/cache_storage.cc

Issue 1174943004: [CacheStorage] Use URLRequestContextGetter instead of URLRequestContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Actually pass a getter Created 5 years, 6 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/cache_storage/cache_storage.cc
diff --git a/content/browser/cache_storage/cache_storage.cc b/content/browser/cache_storage/cache_storage.cc
index 24cc38bdee0effb87a8dedf5986f70e601edc8ce..26174652cb06efb049662e2a869b81b918ec55d5 100644
--- a/content/browser/cache_storage/cache_storage.cc
+++ b/content/browser/cache_storage/cache_storage.cc
@@ -24,6 +24,7 @@
#include "content/public/browser/browser_thread.h"
#include "net/base/directory_lister.h"
#include "net/base/net_errors.h"
+#include "net/url_request/url_request_context_getter.h"
#include "storage/browser/blob/blob_storage_context.h"
#include "storage/browser/quota/quota_manager_proxy.h"
@@ -52,7 +53,7 @@ class CacheStorage::CacheLoader {
CacheLoader(
base::SequencedTaskRunner* cache_task_runner,
- net::URLRequestContext* request_context,
+ const scoped_refptr<net::URLRequestContextGetter>& request_context,
const scoped_refptr<storage::QuotaManagerProxy>& quota_manager_proxy,
base::WeakPtr<storage::BlobStorageContext> blob_context,
const GURL& origin)
@@ -90,7 +91,7 @@ class CacheStorage::CacheLoader {
protected:
scoped_refptr<base::SequencedTaskRunner> cache_task_runner_;
- net::URLRequestContext* request_context_;
+ scoped_refptr<net::URLRequestContextGetter> request_context_;
scoped_refptr<storage::QuotaManagerProxy> quota_manager_proxy_;
base::WeakPtr<storage::BlobStorageContext> blob_context_;
GURL origin_;
@@ -104,7 +105,7 @@ class CacheStorage::MemoryLoader : public CacheStorage::CacheLoader {
public:
MemoryLoader(
base::SequencedTaskRunner* cache_task_runner,
- net::URLRequestContext* request_context,
+ const scoped_refptr<net::URLRequestContextGetter>& request_context,
const scoped_refptr<storage::QuotaManagerProxy>& quota_manager_proxy,
base::WeakPtr<storage::BlobStorageContext> blob_context,
const GURL& origin)
@@ -160,7 +161,7 @@ class CacheStorage::SimpleCacheLoader : public CacheStorage::CacheLoader {
SimpleCacheLoader(
const base::FilePath& origin_path,
base::SequencedTaskRunner* cache_task_runner,
- net::URLRequestContext* request_context,
+ const scoped_refptr<net::URLRequestContextGetter>& request_context,
const scoped_refptr<storage::QuotaManagerProxy>& quota_manager_proxy,
base::WeakPtr<storage::BlobStorageContext> blob_context,
const GURL& origin)
@@ -357,7 +358,7 @@ CacheStorage::CacheStorage(
const base::FilePath& path,
bool memory_only,
base::SequencedTaskRunner* cache_task_runner,
- net::URLRequestContext* request_context,
+ const scoped_refptr<net::URLRequestContextGetter>& request_context,
const scoped_refptr<storage::QuotaManagerProxy>& quota_manager_proxy,
base::WeakPtr<storage::BlobStorageContext> blob_context,
const GURL& origin)

Powered by Google App Engine
This is Rietveld 408576698