Notify ServiceWorkerContextWatcher about routing ids of ServiceWorkerVersion and their updates.

content/browser/service_worker/service_worker_context_watcher.cc

 // Copyright 2015 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_context_watcher.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/containers/scoped_ptr_hash_map.h"
@@ skipping 147 matching lines @@
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(version_callback_, versions));
 }
 
 void ServiceWorkerContextWatcher::OnNewLiveRegistration(int64_t registration_id,
                                                         const GURL& pattern) {
   SendRegistrationInfo(registration_id, pattern,
                        ServiceWorkerRegistrationInfo::IS_NOT_DELETED);
 }
 
-void ServiceWorkerContextWatcher::OnNewLiveVersion(int64_t version_id,
-                                                   int64_t registration_id,
-                                                   const GURL& script_url) {
+void ServiceWorkerContextWatcher::OnNewLiveVersion(
+    const ServiceWorkerVersionInfo& version_info) {
+  int64_t version_id = version_info.version_id;
   if (ServiceWorkerVersionInfo* version = version_info_map_.get(version_id)) {
-    DCHECK_EQ(version->registration_id, registration_id);
-    DCHECK_EQ(version->script_url, script_url);
+    DCHECK_EQ(version->registration_id, version_info.registration_id);
+    DCHECK_EQ(version->script_url, version_info.script_url);
     return;
   }
 
   std::unique_ptr<ServiceWorkerVersionInfo> version(
-      new ServiceWorkerVersionInfo());
-  version->version_id = version_id;
-  version->registration_id = registration_id;
-  version->script_url = script_url;
+      new ServiceWorkerVersionInfo(version_info));
   SendVersionInfo(*version);
   if (!IsStoppedAndRedundant(*version))
     version_info_map_.set(version_id, std::move(version));
 }
 
 void ServiceWorkerContextWatcher::OnRunningStateChanged(
     int64_t version_id,
     content::EmbeddedWorkerStatus running_status) {
   ServiceWorkerVersionInfo* version = version_info_map_.get(version_id);
   DCHECK(version);
@@ skipping 11 matching lines @@
   ServiceWorkerVersionInfo* version = version_info_map_.get(version_id);
   DCHECK(version);
   if (version->status == status)
     return;
   version->status = status;
   SendVersionInfo(*version);
   if (IsStoppedAndRedundant(*version))
     version_info_map_.erase(version_id);
 }
 
+void ServiceWorkerContextWatcher::OnVersionRoutingIdsChanged(

[horo, 2016/09/26 01:30:05]

OnVersionDevToolsRoutingIdChanged

[dgozman, 2016/09/26 15:49:12]

Done.

+    int64_t version_id,
+    int process_id,
+    int devtools_agent_route_id) {
+  ServiceWorkerVersionInfo* version = version_info_map_.get(version_id);
+  DCHECK(version);
+  if (version->process_id == process_id &&
+      version->devtools_agent_route_id == devtools_agent_route_id) {
+    return;
+  }
+  version->process_id = process_id;
+  version->devtools_agent_route_id = devtools_agent_route_id;
+  SendVersionInfo(*version);
+  if (IsStoppedAndRedundant(*version))
+    version_info_map_.erase(version_id);
+}
+
 void ServiceWorkerContextWatcher::OnMainScriptHttpResponseInfoSet(
     int64_t version_id,
     base::Time script_response_time,
     base::Time script_last_modified) {
   ServiceWorkerVersionInfo* version = version_info_map_.get(version_id);
   DCHECK(version);
   version->script_response_time = script_response_time;
   version->script_last_modified = script_last_modified;
   SendVersionInfo(*version);
 }
@@ skipping 55 matching lines @@
                        ServiceWorkerRegistrationInfo::IS_NOT_DELETED);
 }
 
 void ServiceWorkerContextWatcher::OnRegistrationDeleted(int64_t registration_id,
                                                         const GURL& pattern) {
   SendRegistrationInfo(registration_id, pattern,
                        ServiceWorkerRegistrationInfo::IS_DELETED);
 }
 
 }  // namespace content