//content: Change ScopedTempDir::path() to GetPath()

content/browser/service_worker/service_worker_storage_unittest.cc

 // Copyright 2013 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.
 
 #include "content/browser/service_worker/service_worker_storage.h"
 
 #include <stdint.h>
 #include <string>
 #include <utility>
 
@@ skipping 275 matching lines @@
       : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {
   }
 
   void SetUp() override { InitializeTestHelper(); }
 
   void TearDown() override {
     helper_.reset();
     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();
   }
 
   ServiceWorkerContextCore* context() { return helper_->context(); }
   ServiceWorkerStorage* storage() { return helper_->context()->storage(); }
 
   // A static class method for friendliness.
   static void VerifyPurgeableListStatusCallback(
       ServiceWorkerDatabase* database,
       std::set<int64_t>* purgeable_ids,
@@ skipping 182 matching lines @@
     ServiceWorkerStatusCode result = SERVICE_WORKER_ERROR_MAX_VALUE;
     storage()->FindRegistrationForIdOnly(
         registration_id, MakeFindCallback(&was_called, &result, registration));
     base::RunLoop().RunUntilIdle();
     EXPECT_TRUE(was_called);
     return result;
   }
 
   // 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_;
 };
 
 TEST_F(ServiceWorkerStorageTest, DisabledStorage) {
   const GURL kScope("http://www.example.com/scope/");
   const GURL kScript("http://www.example.com/script.js");
   const GURL kDocumentUrl("http://www.example.com/scope/document.html");
   const int64_t kRegistrationId = 0;
   const int64_t kVersionId = 0;
@@ skipping 1239 matching lines @@
   // Remove other registration at first origin.
   EXPECT_EQ(SERVICE_WORKER_OK,
             DeleteRegistration(kRegistrationId2, kScope2.GetOrigin()));
 
   // No foreign fetch registrations remain.
   EXPECT_FALSE(storage()->OriginHasForeignFetchRegistrations(kOrigin1));
   EXPECT_FALSE(storage()->OriginHasForeignFetchRegistrations(kOrigin2));
 }
 
 }  // namespace content