ServiceWorker: Rename ScriptClientMap to ProviderClientMap

ScriptClientMap actually contains provider clients, not script clients.

BUG=n/a
TEST=compile

Review URL: https://codereview.chromium.org/854543002

Cr-Commit-Position: refs/heads/master@{#311442}

content/child/service_worker/service_worker_dispatcher.cc

@@ -196,18 +196,18 @@ void ServiceWorkerDispatcher::RemoveProviderContext(
   worker_to_provider_.erase(provider_context->controller_handle_id());
 }
 
-void ServiceWorkerDispatcher::AddScriptClient(
+void ServiceWorkerDispatcher::AddProviderClient(
     int provider_id,
     blink::WebServiceWorkerProviderClient* client) {
   DCHECK(client);
-  DCHECK(!ContainsKey(script_clients_, provider_id));
-  script_clients_[provider_id] = client;
+  DCHECK(!ContainsKey(provider_clients_, provider_id));
+  provider_clients_[provider_id] = client;
 }
 
-void ServiceWorkerDispatcher::RemoveScriptClient(int provider_id) {
+void ServiceWorkerDispatcher::RemoveProviderClient(int provider_id) {
   // This could be possibly called multiple times to ensure termination.
-  if (ContainsKey(script_clients_, provider_id))
-    script_clients_.erase(provider_id);
+  if (ContainsKey(provider_clients_, provider_id))
+    provider_clients_.erase(provider_id);
 }
 
 ServiceWorkerDispatcher*
@@ -601,8 +601,8 @@ void ServiceWorkerDispatcher::SetReadyRegistration(
     return;
   }
 
-  ScriptClientMap::iterator client = script_clients_.find(provider_id);
-  if (client == script_clients_.end())
+  ProviderClientMap::iterator client = provider_clients_.find(provider_id);
+  if (client == provider_clients_.end())
     return;
 
   ServiceWorkerRegistrationObjectInfo info =
@@ -640,8 +640,8 @@ void ServiceWorkerDispatcher::OnSetControllerServiceWorker(
     provider->second->OnSetControllerServiceWorker(info);
   }
 
-  ScriptClientMap::iterator found = script_clients_.find(provider_id);
-  if (found != script_clients_.end()) {
+  ProviderClientMap::iterator found = provider_clients_.find(provider_id);
+  if (found != provider_clients_.end()) {
     // Populate the .controller field with the new worker object.
     found->second->setController(GetServiceWorker(info, false),
                                  should_notify_controllerchange);
@@ -661,8 +661,8 @@ void ServiceWorkerDispatcher::OnPostMessage(
                "ServiceWorkerDispatcher::OnPostMessage",
                "Thread ID", thread_id);
 
-  ScriptClientMap::iterator found = script_clients_.find(provider_id);
-  if (found == script_clients_.end()) {
+  ProviderClientMap::iterator found = provider_clients_.find(provider_id);
+  if (found == provider_clients_.end()) {
     // For now we do no queueing for messages sent to nonexistent / unattached
     // client.
     return;
@@ -686,10 +686,10 @@ void ServiceWorkerDispatcher::OnGetClientInfo(int thread_id,
                                               int request_id,
                                               int provider_id) {
   blink::WebServiceWorkerClientInfo info;
-  ScriptClientMap::iterator found = script_clients_.find(provider_id);
+  ProviderClientMap::iterator found = provider_clients_.find(provider_id);
   // TODO(ksakamoto): Could we track these values in the browser side? Except
   // for |isFocused|, it would be pretty easy.
-  if (found != script_clients_.end() && found->second->getClientInfo(&info)) {
+  if (found != provider_clients_.end() && found->second->getClientInfo(&info)) {
     ServiceWorkerClientInfo result;
     result.client_id = info.clientID;
     result.page_visibility_state = info.pageVisibilityState;

content/child/service_worker/service_worker_dispatcher.h

@@ -83,9 +83,9 @@ class ServiceWorkerDispatcher : public WorkerTaskRunner::Observer {
 
   // Called when navigator.serviceWorker is instantiated or detached
   // for a document whose provider can be identified by |provider_id|.
-  void AddScriptClient(int provider_id,
-                       blink::WebServiceWorkerProviderClient* client);
-  void RemoveScriptClient(int provider_id);
+  void AddProviderClient(int provider_id,
+                         blink::WebServiceWorkerProviderClient* client);
+  void RemoveProviderClient(int provider_id);
 
   // If an existing WebServiceWorkerImpl exists for the Service
   // Worker, it is returned; otherwise a WebServiceWorkerImpl is
@@ -136,10 +136,12 @@ class ServiceWorkerDispatcher : public WorkerTaskRunner::Observer {
       IDMapOwnPointer> UnregistrationCallbackMap;
   typedef IDMap<WebServiceWorkerGetRegistrationCallbacks,
       IDMapOwnPointer> GetRegistrationCallbackMap;
-  typedef std::map<int, blink::WebServiceWorkerProviderClient*> ScriptClientMap;
+
+  typedef std::map<int, blink::WebServiceWorkerProviderClient*>
+      ProviderClientMap;
   typedef std::map<int, ServiceWorkerProviderContext*> ProviderContextMap;
-  typedef std::map<int, WebServiceWorkerImpl*> WorkerObjectMap;
   typedef std::map<int, ServiceWorkerProviderContext*> WorkerToProviderMap;
+  typedef std::map<int, WebServiceWorkerImpl*> WorkerObjectMap;
   typedef std::map<int, WebServiceWorkerRegistrationImpl*>
       RegistrationObjectMap;
 
@@ -237,8 +239,10 @@ class ServiceWorkerDispatcher : public WorkerTaskRunner::Observer {
   RegistrationCallbackMap pending_registration_callbacks_;
   UnregistrationCallbackMap pending_unregistration_callbacks_;
   GetRegistrationCallbackMap pending_get_registration_callbacks_;
-  ScriptClientMap script_clients_;
+
+  ProviderClientMap provider_clients_;
   ProviderContextMap provider_contexts_;
+
   WorkerObjectMap service_workers_;
   RegistrationObjectMap registrations_;
 

content/child/service_worker/web_service_worker_provider_impl.cc

@@ -31,14 +31,14 @@ WebServiceWorkerProviderImpl::WebServiceWorkerProviderImpl(
 }
 
 WebServiceWorkerProviderImpl::~WebServiceWorkerProviderImpl() {
-  // Make sure the script client is removed.
-  RemoveScriptClient();
+  // Make sure the provider client is removed.
+  RemoveProviderClient();
 }
 
 void WebServiceWorkerProviderImpl::setClient(
     blink::WebServiceWorkerProviderClient* client) {
   if (!client) {
-    RemoveScriptClient();
+    RemoveProviderClient();
     return;
   }
 
@@ -47,7 +47,7 @@ void WebServiceWorkerProviderImpl::setClient(
   // (e.g. on document and on dedicated workers) can properly share
   // the single provider context across threads. (http://crbug.com/366538
   // for more context)
-  GetDispatcher()->AddScriptClient(provider_id_, client);
+  GetDispatcher()->AddProviderClient(provider_id_, client);
 
   if (!context_->registration()) {
     // This provider is not associated with any registration.
@@ -101,13 +101,13 @@ void WebServiceWorkerProviderImpl::getRegistration(
   GetDispatcher()->GetRegistration(provider_id_, document_url, callbacks);
 }
 
-void WebServiceWorkerProviderImpl::RemoveScriptClient() {
-  // Remove the script client, but only if the dispatcher is still there.
+void WebServiceWorkerProviderImpl::RemoveProviderClient() {
+  // Remove the provider client, but only if the dispatcher is still there.
   // (For cleanup path we don't need to bother creating a new dispatcher)
   ServiceWorkerDispatcher* dispatcher =
       ServiceWorkerDispatcher::GetThreadSpecificInstance();
   if (dispatcher)
-    dispatcher->RemoveScriptClient(provider_id_);
+    dispatcher->RemoveProviderClient(provider_id_);
 }
 
 ServiceWorkerDispatcher* WebServiceWorkerProviderImpl::GetDispatcher() {

content/child/service_worker/web_service_worker_provider_impl.h

@@ -48,7 +48,7 @@ class WebServiceWorkerProviderImpl
   int provider_id() const { return provider_id_; }
 
  private:
-  void RemoveScriptClient();
+  void RemoveProviderClient();
   ServiceWorkerDispatcher* GetDispatcher();
 
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;