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

Unified Diff: content/browser/service_worker/service_worker_storage_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/service_worker/service_worker_storage_unittest.cc
diff --git a/content/browser/service_worker/service_worker_storage_unittest.cc b/content/browser/service_worker/service_worker_storage_unittest.cc
index 52f9d85b8d09d0aeab8643069ffa2b5e5407819f..50a1ca8bf5eaf6219194987ef27affa8337cce39 100644
--- a/content/browser/service_worker/service_worker_storage_unittest.cc
+++ b/content/browser/service_worker/service_worker_storage_unittest.cc
@@ -293,14 +293,15 @@ class ServiceWorkerStorageTest : public testing::Test {
base::RunLoop().RunUntilIdle();
}
- base::FilePath GetUserDataDirectory() { return user_data_directory_.path(); }
-
bool InitUserDataDirectory() {
- return user_data_directory_.CreateUniqueTempDir();
+ if (!user_data_directory_.CreateUniqueTempDir())
+ return false;
+ user_data_directory_path_ = user_data_directory_.GetPath();
+ return true;
}
void InitializeTestHelper() {
- helper_.reset(new EmbeddedWorkerTestHelper(GetUserDataDirectory()));
+ helper_.reset(new EmbeddedWorkerTestHelper(user_data_directory_path_));
base::RunLoop().RunUntilIdle();
}
@@ -503,6 +504,7 @@ class ServiceWorkerStorageTest : public testing::Test {
// user_data_directory_ must be declared first to preserve destructor order.
base::ScopedTempDir user_data_directory_;
+ base::FilePath user_data_directory_path_;
std::unique_ptr<EmbeddedWorkerTestHelper> helper_;
TestBrowserThreadBundle browser_thread_bundle_;
};

Powered by Google App Engine
This is Rietveld 408576698