ServiceWorker: Rename path -> user_data_directory for clarity.

The ServiceWorkerContextCore constructor declaration uses
user_data_directory as the name of its base::FilePath argument. However,
the definition renames the argument to "path". This less expressive name
is then used in ServiceWorkerStorage.

This CL replaces "path" with "user_data_directory". This adds clarity to
the code and adds consistency between declaration / definition argument
names.

Change-Id: Ib5dc48d5c935a84e654b8b057858fb18b2be6ee5
Reviewed-on: https://chromium-review.googlesource.com/1045909Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556374}

content/browser/service_worker/service_worker_context_core.cc

@@ -269,7 +269,7 @@ bool ServiceWorkerContextCore::ProviderHostIterator::
 }
 
 ServiceWorkerContextCore::ServiceWorkerContextCore(
-    const base::FilePath& path,
+    const base::FilePath& user_data_directory,
     scoped_refptr<base::SequencedTaskRunner> database_task_runner,
     storage::QuotaManagerProxy* quota_manager_proxy,
     storage::SpecialStoragePolicy* special_storage_policy,
@@ -290,8 +290,8 @@ ServiceWorkerContextCore::ServiceWorkerContextCore(
   // These get a WeakPtr from |weak_factory_|, so must be set after
   // |weak_factory_| is initialized.
   storage_ = ServiceWorkerStorage::Create(
-      path, AsWeakPtr(), std::move(database_task_runner), quota_manager_proxy,
-      special_storage_policy);
+      user_data_directory, AsWeakPtr(), std::move(database_task_runner),
+      quota_manager_proxy, special_storage_policy);
   embedded_worker_registry_ = EmbeddedWorkerRegistry::Create(AsWeakPtr());
   job_coordinator_ = std::make_unique<ServiceWorkerJobCoordinator>(AsWeakPtr());
 }

content/browser/service_worker/service_worker_storage.cc

@@ -120,24 +120,25 @@ ServiceWorkerStorage::~ServiceWorkerStorage() {
 
 // static
 std::unique_ptr<ServiceWorkerStorage> ServiceWorkerStorage::Create(
-    const base::FilePath& path,
+    const base::FilePath& user_data_directory,
     const base::WeakPtr<ServiceWorkerContextCore>& context,
     scoped_refptr<base::SequencedTaskRunner> database_task_runner,
     storage::QuotaManagerProxy* quota_manager_proxy,
     storage::SpecialStoragePolicy* special_storage_policy) {
-  return base::WrapUnique(
-      new ServiceWorkerStorage(path, context, std::move(database_task_runner),
-                               quota_manager_proxy, special_storage_policy));
+  return base::WrapUnique(new ServiceWorkerStorage(
+      user_data_directory, context, std::move(database_task_runner),
+      quota_manager_proxy, special_storage_policy));
 }
 
 // static
 std::unique_ptr<ServiceWorkerStorage> ServiceWorkerStorage::Create(
     const base::WeakPtr<ServiceWorkerContextCore>& context,
     ServiceWorkerStorage* old_storage) {
-  return base::WrapUnique(new ServiceWorkerStorage(
-      old_storage->path_, context, old_storage->database_task_runner_,
-      old_storage->quota_manager_proxy_.get(),
-      old_storage->special_storage_policy_.get()));
+  return base::WrapUnique(
+      new ServiceWorkerStorage(old_storage->user_data_directory_, context,
+                               old_storage->database_task_runner_,
+                               old_storage->quota_manager_proxy_.get(),
+                               old_storage->special_storage_policy_.get()));
 }
 
 void ServiceWorkerStorage::FindRegistrationForDocument(
@@ -1051,7 +1052,7 @@ void ServiceWorkerStorage::PurgeResources(const ResourceList& resources) {
 }
 
 ServiceWorkerStorage::ServiceWorkerStorage(
-    const base::FilePath& path,
+    const base::FilePath& user_data_directory,
     base::WeakPtr<ServiceWorkerContextCore> context,
     scoped_refptr<base::SequencedTaskRunner> database_task_runner,
     storage::QuotaManagerProxy* quota_manager_proxy,
@@ -1061,7 +1062,7 @@ ServiceWorkerStorage::ServiceWorkerStorage(
       next_resource_id_(kInvalidServiceWorkerResourceId),
       state_(UNINITIALIZED),
       expecting_done_with_disk_on_disable_(false),
-      path_(path),
+      user_data_directory_(user_data_directory),
       context_(context),
       database_task_runner_(std::move(database_task_runner)),
       quota_manager_proxy_(quota_manager_proxy),
@@ -1074,16 +1075,18 @@ ServiceWorkerStorage::ServiceWorkerStorage(
 }
 
 base::FilePath ServiceWorkerStorage::GetDatabasePath() {
-  if (path_.empty())
+  if (user_data_directory_.empty())
     return base::FilePath();
-  return path_.Append(ServiceWorkerContextCore::kServiceWorkerDirectory)
+  return user_data_directory_
+      .Append(ServiceWorkerContextCore::kServiceWorkerDirectory)
       .Append(kDatabaseName);
 }
 
 base::FilePath ServiceWorkerStorage::GetDiskCachePath() {
-  if (path_.empty())
+  if (user_data_directory_.empty())
     return base::FilePath();
-  return path_.Append(ServiceWorkerContextCore::kServiceWorkerDirectory)
+  return user_data_directory_
+      .Append(ServiceWorkerContextCore::kServiceWorkerDirectory)
       .Append(kDiskCacheName);
 }
 

content/browser/service_worker/service_worker_storage.h

@@ -97,7 +97,7 @@ class CONTENT_EXPORT ServiceWorkerStorage
   ~ServiceWorkerStorage() override;
 
   static std::unique_ptr<ServiceWorkerStorage> Create(
-      const base::FilePath& path,
+      const base::FilePath& user_data_directory,
       const base::WeakPtr<ServiceWorkerContextCore>& context,
       scoped_refptr<base::SequencedTaskRunner> database_task_runner,
       storage::QuotaManagerProxy* quota_manager_proxy,
@@ -356,7 +356,7 @@ class CONTENT_EXPORT ServiceWorkerStorage
                               ServiceWorkerDatabase::Status status)>;
 
   ServiceWorkerStorage(
-      const base::FilePath& path,
+      const base::FilePath& user_data_directory,
       base::WeakPtr<ServiceWorkerContextCore> context,
       scoped_refptr<base::SequencedTaskRunner> database_task_runner,
       storage::QuotaManagerProxy* quota_manager_proxy,
@@ -583,7 +583,7 @@ class CONTENT_EXPORT ServiceWorkerStorage
   // ... so it's easier to keep track of the case when it will happen.
   bool expecting_done_with_disk_on_disable_;
 
-  base::FilePath path_;
+  base::FilePath user_data_directory_;
 
   // The context should be valid while the storage is alive.
   base::WeakPtr<ServiceWorkerContextCore> context_;