Check the BrowserContext when ServiceWorkerHandler gets the ServiceWorkerDevToolsAgentHosts

content/browser/devtools/protocol/service_worker_handler.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/devtools/protocol/service_worker_handler.h"
 
 #include "base/bind.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 111 matching lines @@
     std::string scope = path.substr(0, path.length() - file.length());
     if (scope.length() > best_scope.length()) {
       best_host = host;
       best_scope = scope;
     }
   }
   return best_host;
 }
 
 ServiceWorkerDevToolsAgentHost::Map GetMatchingServiceWorkers(
+    BrowserContext* browser_context,
     const std::set<GURL>& urls) {
+  ServiceWorkerDevToolsAgentHost::Map result;
+  if (!browser_context)
+    return result;
   ServiceWorkerDevToolsAgentHost::List agent_hosts;
-  ServiceWorkerDevToolsManager::GetInstance()->
-      AddAllAgentHosts(&agent_hosts);
-  ServiceWorkerDevToolsAgentHost::Map result;
+  ServiceWorkerDevToolsManager::GetInstance()
+      ->AddAllAgentHostsForBrowserContext(browser_context, &agent_hosts);
   for (const GURL& url : urls) {
     scoped_refptr<ServiceWorkerDevToolsAgentHost> host =
         GetMatchingServiceWorker(agent_hosts, url);
     if (host)
       result[host->GetId()] = host;
   }
   return result;
 }
 
 bool CollectURLs(std::set<GURL>* urls, FrameTreeNode* tree_node) {
@@ skipping 59 matching lines @@
 
 void ServiceWorkerHandler::SetClient(scoped_ptr<Client> client) {
   client_.swap(client);
 }
 
 void ServiceWorkerHandler::UpdateHosts() {
   if (!enabled_)
     return;
 
   urls_.clear();
+  BrowserContext* browser_context = nullptr;
   if (render_frame_host_) {
     render_frame_host_->frame_tree_node()->frame_tree()->ForEach(
         base::Bind(&CollectURLs, &urls_));
+    browser_context = render_frame_host_->GetProcess()->GetBrowserContext();
   }
 
   ServiceWorkerDevToolsAgentHost::Map old_hosts = attached_hosts_;
   ServiceWorkerDevToolsAgentHost::Map new_hosts =
-      GetMatchingServiceWorkers(urls_);
+      GetMatchingServiceWorkers(browser_context, urls_);
 
   for (auto pair : old_hosts) {
     if (new_hosts.find(pair.first) == new_hosts.end())
       ReportWorkerTerminated(pair.second.get());
   }
 
   for (auto pair : new_hosts) {
     if (old_hosts.find(pair.first) == old_hosts.end())
       ReportWorkerCreated(pair.second.get());
   }
@@ skipping 222 matching lines @@
 void ServiceWorkerHandler::AgentHostClosed(
     DevToolsAgentHost* host,
     bool replaced_with_another_client) {
   client_->WorkerTerminated(WorkerTerminatedParams::Create()->
       set_worker_id(host->GetId()));
   attached_hosts_.erase(host->GetId());
 }
 
 void ServiceWorkerHandler::WorkerCreated(
     ServiceWorkerDevToolsAgentHost* host) {
-  auto hosts = GetMatchingServiceWorkers(urls_);
+  BrowserContext* browser_context = nullptr;
+  if (render_frame_host_)
+    browser_context = render_frame_host_->GetProcess()->GetBrowserContext();
+
+  auto hosts = GetMatchingServiceWorkers(browser_context, urls_);
   if (hosts.find(host->GetId()) != hosts.end() && !host->IsAttached() &&
       !host->IsPausedForDebugOnStart())
     host->PauseForDebugOnStart();
 }
 
 void ServiceWorkerHandler::WorkerReadyForInspection(
     ServiceWorkerDevToolsAgentHost* host) {
   if (ServiceWorkerDevToolsManager::GetInstance()
           ->debug_service_worker_on_start()) {
     // When debug_service_worker_on_start is true, a new DevTools window will
@@ skipping 31 matching lines @@
     return;
   host->DetachClient();
   client_->WorkerTerminated(WorkerTerminatedParams::Create()->
       set_worker_id(host->GetId()));
   attached_hosts_.erase(it);
 }
 
 }  // namespace service_worker
 }  // namespace devtools
 }  // namespace content