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

Unified Diff: content/browser/cache_storage/cache_storage_manager.h

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_manager.h
diff --git a/content/browser/cache_storage/cache_storage_manager.h b/content/browser/cache_storage/cache_storage_manager.h
index b9eeda696a0c51eb90e0959869669a0fb563717b..dc05360e80f1ff83fa836e71762b9ae9f834c929 100644
--- a/content/browser/cache_storage/cache_storage_manager.h
+++ b/content/browser/cache_storage/cache_storage_manager.h
@@ -13,6 +13,7 @@
#include "base/gtest_prod_util.h"
#include "content/browser/cache_storage/cache_storage.h"
#include "content/common/content_export.h"
+#include "net/url_request/url_request_context_getter.h"
#include "storage/browser/quota/quota_client.h"
#include "url/gurl.h"
@@ -20,10 +21,6 @@ namespace base {
class SequencedTaskRunner;
}
-namespace net {
-class URLRequestContext;
-}
-
namespace storage {
class BlobStorageContext;
class QuotaManagerProxy;
@@ -73,7 +70,7 @@ class CONTENT_EXPORT CacheStorageManager {
// This must be called before creating any of the public *Cache functions
// above.
void SetBlobParametersForCache(
- net::URLRequestContext* request_context,
+ const scoped_refptr<net::URLRequestContextGetter>& request_context,
mmenke 2015/06/10 17:00:31 include ref_counted.h
jkarlin 2015/06/10 18:26:03 Done.
base::WeakPtr<storage::BlobStorageContext> blob_storage_context);
base::WeakPtr<CacheStorageManager> AsWeakPtr() {
@@ -110,7 +107,7 @@ class CONTENT_EXPORT CacheStorageManager {
scoped_ptr<CacheStorage> cache_storage,
base::WeakPtr<CacheStorageManager> cache_manager);
- net::URLRequestContext* url_request_context() const {
+ scoped_refptr<net::URLRequestContextGetter> url_request_context() const {
return request_context_;
}
base::WeakPtr<storage::BlobStorageContext> blob_storage_context() const {
@@ -147,7 +144,7 @@ class CONTENT_EXPORT CacheStorageManager {
// |cache_task_runner_|.
CacheStorageMap cache_storage_map_;
- net::URLRequestContext* request_context_;
+ scoped_refptr<net::URLRequestContextGetter> request_context_;
base::WeakPtr<storage::BlobStorageContext> blob_context_;
base::WeakPtrFactory<CacheStorageManager> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698