Chromium Code Reviews| Index: content/browser/cache_storage/cache_storage_manager_unittest.cc |
| diff --git a/content/browser/cache_storage/cache_storage_manager_unittest.cc b/content/browser/cache_storage/cache_storage_manager_unittest.cc |
| index f8d94976e2bc33004aac54696cfaae87cea18f17..ada41ef140965ab9975a06331cb5d7705634af7a 100644 |
| --- a/content/browser/cache_storage/cache_storage_manager_unittest.cc |
| +++ b/content/browser/cache_storage/cache_storage_manager_unittest.cc |
| @@ -24,6 +24,7 @@ |
| #include "content/browser/quota/mock_quota_manager_proxy.h" |
| #include "content/public/browser/browser_thread.h" |
| #include "content/public/browser/cache_storage_usage_info.h" |
| +#include "content/public/test/mock_special_storage_policy.h" |
| #include "content/public/test/test_browser_context.h" |
| #include "content/public/test/test_browser_thread_bundle.h" |
| #include "net/url_request/url_request_context.h" |
| @@ -75,19 +76,21 @@ class CacheStorageManagerTest : public testing::Test { |
| url_request_context->set_job_factory(url_request_job_factory_.get()); |
| + if (!MemoryOnly()) |
| + ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); |
| + base::FilePath path = MemoryOnly() ? base::FilePath() : temp_dir_.path(); |
| + |
| + quota_policy_ = new MockSpecialStoragePolicy; |
| + mock_quota_manager_ = new MockQuotaManager( |
| + MemoryOnly() /* is incognito */, path, |
|
michaeln
2016/01/26 00:16:08
not sure you really need the |path| local? temp_di
jkarlin
2016/01/26 12:08:35
Done. Also in cache_storage_cache_unittest.cc
|
| + base::ThreadTaskRunnerHandle::Get().get(), |
| + base::ThreadTaskRunnerHandle::Get().get(), quota_policy_.get()); |
| quota_manager_proxy_ = new MockQuotaManagerProxy( |
| - nullptr, base::ThreadTaskRunnerHandle::Get().get()); |
| + mock_quota_manager_.get(), base::ThreadTaskRunnerHandle::Get().get()); |
| - if (MemoryOnly()) { |
| - cache_manager_ = CacheStorageManager::Create( |
| - base::FilePath(), base::ThreadTaskRunnerHandle::Get(), |
| - quota_manager_proxy_); |
| - } else { |
| - ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); |
| - cache_manager_ = CacheStorageManager::Create( |
| - temp_dir_.path(), base::ThreadTaskRunnerHandle::Get(), |
| - quota_manager_proxy_); |
| - } |
| + cache_manager_ = CacheStorageManager::Create( |
| + temp_dir_.path(), base::ThreadTaskRunnerHandle::Get(), |
| + quota_manager_proxy_); |
| cache_manager_->SetBlobParametersForCache( |
| browser_context_.GetRequestContext(), |
| @@ -307,6 +310,8 @@ class CacheStorageManagerTest : public testing::Test { |
| scoped_ptr<net::URLRequestJobFactoryImpl> url_request_job_factory_; |
| storage::BlobStorageContext* blob_storage_context_; |
| + scoped_refptr<MockSpecialStoragePolicy> quota_policy_; |
| + scoped_refptr<MockQuotaManager> mock_quota_manager_; |
| scoped_refptr<MockQuotaManagerProxy> quota_manager_proxy_; |
| scoped_ptr<CacheStorageManager> cache_manager_; |