[DevTools] Attach all ServiceWorkers that match the origin.

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 144 matching lines @@
       std::unique_ptr<ServiceWorkerDevToolsAgentHost::List> new_list(
           new ServiceWorkerDevToolsAgentHost::List());
       new_list->push_back(host);
       (*scope_agents_map)[host->scope()] = std::move(new_list);
     } else {
       it->second->push_back(host);
     }
   }
 }
 
-GURL GetBestMatchingScope(const ScopeAgentsMap& scope_agents_map,
-                          const GURL& url) {
-  GURL best_scope;
-  bool best_scope_matched = false;
-  int best_scope_length = 0;
-
-  for (const auto& it : scope_agents_map) {
-    if (it.first.host_piece() != url.host_piece())
-      continue;
-    const bool scope_matched = ServiceWorkerUtils::ScopeMatches(it.first, url);
-    const int scope_length = it.first.spec().length();
-    bool replace = false;
-    if (!best_scope.is_empty())
-      replace = true;
-    else if (best_scope_matched)
-      replace = scope_matched && scope_length >= best_scope_length;
-    else
-      replace = scope_matched || scope_length >= best_scope_length;
-
-    if (replace) {
-      best_scope = it.first;
-      best_scope_matched = scope_matched;
-      best_scope_length = scope_length;
-    }
-  }
-  return best_scope;
-}
-
 void AddEligibleHosts(const ServiceWorkerDevToolsAgentHost::List& list,
                       ServiceWorkerDevToolsAgentHost::Map* result) {
   base::Time last_installed_time;
   base::Time last_doomed_time;
   for (const auto& host : list) {
     if (host->version_installed_time() > last_installed_time)
       last_installed_time = host->version_installed_time();
     if (host->version_doomed_time() > last_doomed_time)
       last_doomed_time = host->version_doomed_time();
   }
@@ skipping 15 matching lines @@
   if (!browser_context)
     return result;
 
   ServiceWorkerDevToolsAgentHost::List agent_hosts;
   ServiceWorkerDevToolsManager::GetInstance()
       ->AddAllAgentHostsForBrowserContext(browser_context, &agent_hosts);
 
   ScopeAgentsMap scope_agents_map;
   GetMatchingHostsByScopeMap(agent_hosts, urls, &scope_agents_map);
 
-  std::set<GURL> matching_scopes;
-  for (const GURL& url : urls)
-    matching_scopes.insert(GetBestMatchingScope(scope_agents_map, url));
+  for (const auto& it : scope_agents_map)
+    AddEligibleHosts(*it.second.get(), &result);
 
-  for (const auto& it : scope_agents_map) {
-    if (matching_scopes.find(it.first) == matching_scopes.end())
-      continue;
-    AddEligibleHosts(*it.second.get(), &result);
-  }
   return result;
 }
 
 void StopServiceWorkerOnIO(scoped_refptr<ServiceWorkerContextWrapper> context,
                            int64_t version_id) {
   if (content::ServiceWorkerVersion* version =
           context->GetLiveVersion(version_id)) {
     version->StopWorker(base::Bind(&StatusNoOp));
   }
 }
@@ skipping 412 matching lines @@
 }
 
 void ServiceWorkerHandler::ClearForceUpdate() {
   if (context_)
     context_->SetForceUpdateOnPageLoad(false);
 }
 
 }  // namespace service_worker
 }  // namespace devtools
 }  // namespace content