[CacheStorage] Use URLRequestContextGetter instead of URLRequestContext

content/browser/cache_storage/cache_storage_manager.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_MANAGER_H_
 #define CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_MANAGER_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #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"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
-namespace net {
-class URLRequestContext;
-}
-
 namespace storage {
 class BlobStorageContext;
 class QuotaManagerProxy;
 }
 
 namespace content {
 
 class CacheStorageQuotaClient;
 
 // Keeps track of a CacheStorage per origin. There is one
@@ skipping 29 matching lines @@
                   const std::string& cache_name,
                   scoped_ptr<ServiceWorkerFetchRequest> request,
                   const CacheStorageCache::ResponseCallback& callback);
   void MatchAllCaches(const GURL& origin,
                       scoped_ptr<ServiceWorkerFetchRequest> request,
                       const CacheStorageCache::ResponseCallback& callback);
 
   // 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() {
     return weak_ptr_factory_.GetWeakPtr();
   }
 
  private:
   friend class CacheStorageQuotaClient;
   friend class CacheStorageManagerTest;
   friend class CacheStorageMigrationTest;
@@ skipping 16 matching lines @@
       const std::string& host,
       const storage::QuotaClient::GetOriginsCallback& callback);
   void DeleteOriginData(const GURL& origin,
                         const storage::QuotaClient::DeletionCallback& callback);
   static void DeleteOriginDidClose(
       const GURL& origin,
       const storage::QuotaClient::DeletionCallback& callback,
       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 {
     return blob_context_;
   }
   base::FilePath root_path() const { return root_path_; }
   const scoped_refptr<base::SequencedTaskRunner>& cache_task_runner() const {
     return cache_task_runner_;
   }
 
@@ skipping 16 matching lines @@
 
   base::FilePath root_path_;
   scoped_refptr<base::SequencedTaskRunner> cache_task_runner_;
 
   scoped_refptr<storage::QuotaManagerProxy> quota_manager_proxy_;
 
   // The map owns the CacheStorages and the CacheStorages are only accessed on
   // |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_;
   DISALLOW_COPY_AND_ASSIGN(CacheStorageManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_MANAGER_H_