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_; |
}; |