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

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

Issue 2316043002: //content: Change ScopedTempDir::path() to GetPath() (Closed)
Patch Set: Just rebased Created 4 years, 3 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_cache_unittest.cc
diff --git a/content/browser/cache_storage/cache_storage_cache_unittest.cc b/content/browser/cache_storage/cache_storage_cache_unittest.cc
index 7c2b0b27704ce732409d9a8c40a5615b17d9b847..1834e8f3d1251a55634699386a90669defd8c979 100644
--- a/content/browser/cache_storage/cache_storage_cache_unittest.cc
+++ b/content/browser/cache_storage/cache_storage_cache_unittest.cc
@@ -331,13 +331,16 @@ class CacheStorageCacheTest : public testing::Test {
base::RunLoop().RunUntilIdle();
blob_storage_context_ = blob_storage_context->context();
- if (!MemoryOnly())
+ const bool is_incognito = MemoryOnly();
+ base::FilePath temp_dir_path;
+ if (!is_incognito) {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+ temp_dir_path = temp_dir_.GetPath();
+ }
quota_policy_ = new MockSpecialStoragePolicy;
mock_quota_manager_ = new MockQuotaManager(
- MemoryOnly() /* is incognito */, temp_dir_.path(),
- base::ThreadTaskRunnerHandle::Get().get(),
+ is_incognito, temp_dir_path, base::ThreadTaskRunnerHandle::Get().get(),
base::ThreadTaskRunnerHandle::Get().get(), quota_policy_.get());
mock_quota_manager_->SetQuota(GURL(kOrigin), storage::kStorageTypeTemporary,
1024 * 1024 * 100);
@@ -358,7 +361,7 @@ class CacheStorageCacheTest : public testing::Test {
CreateRequests(blob_storage_context);
cache_ = base::MakeUnique<TestCacheStorageCache>(
- GURL(kOrigin), kCacheName, temp_dir_.path(), nullptr /* CacheStorage */,
+ GURL(kOrigin), kCacheName, temp_dir_path, nullptr /* CacheStorage */,
BrowserContext::GetDefaultStoragePartition(&browser_context_)
->GetURLRequestContext(),
quota_manager_proxy_, blob_storage_context->context()->AsWeakPtr());

Powered by Google App Engine
This is Rietveld 408576698