SharedWorker: Make shared workers keyed by a pair of url and name

content/browser/shared_worker/shared_worker_service_impl.cc

 // Copyright 2014 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/shared_worker/shared_worker_service_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <iterator>
@@ skipping 293 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   std::unique_ptr<SharedWorkerInstance> instance(new SharedWorkerInstance(
       params.url, params.name, params.content_security_policy,
       params.security_policy_type, params.creation_address_space,
       resource_context, partition_id, params.creation_context_type));
   std::unique_ptr<SharedWorkerPendingInstance::SharedWorkerPendingRequest>
       request(new SharedWorkerPendingInstance::SharedWorkerPendingRequest(
           filter, route_id, params.document_id, filter->render_process_id(),
           params.render_frame_route_id));
   if (SharedWorkerPendingInstance* pending = FindPendingInstance(*instance)) {
-    if (params.url != pending->instance()->url())
-      return blink::WebWorkerCreationErrorURLMismatch;
     pending->AddRequest(std::move(request));
     if (params.creation_context_type !=
         pending->instance()->creation_context_type())
       return blink::WebWorkerCreationErrorSecureContextMismatch;
     return blink::WebWorkerCreationErrorNone;
   }
 
   std::unique_ptr<SharedWorkerPendingInstance> pending_instance(
       new SharedWorkerPendingInstance(std::move(instance)));
   pending_instance->AddRequest(std::move(request));
@@ skipping 160 matching lines @@
   if (!pending_instance->requests()->size())
     return blink::WebWorkerCreationErrorNone;
 
   int worker_process_id = -1;
   int worker_route_id = MSG_ROUTING_NONE;
   bool is_new_worker = true;
   blink::WebWorkerCreationError creation_error =
       blink::WebWorkerCreationErrorNone;
   SharedWorkerHost* host = FindSharedWorkerHost(*pending_instance->instance());
   if (host) {
-    if (pending_instance->instance()->url() != host->instance()->url())
-      return blink::WebWorkerCreationErrorURLMismatch;
     if (pending_instance->instance()->creation_context_type() !=
         host->instance()->creation_context_type()) {
       creation_error = blink::WebWorkerCreationErrorSecureContextMismatch;
     }
     worker_process_id = host->process_id();
     worker_route_id = host->worker_route_id();
     is_new_worker = false;
   } else {
     SharedWorkerMessageFilter* first_filter =
         (*pending_instance->requests()->begin())->filter;
@@ skipping 168 matching lines @@
     UpdateWorkerDependencyFunc new_func) {
   update_worker_dependency_ = new_func;
 }
 
 void SharedWorkerServiceImpl::ChangeTryIncrementWorkerRefCountFuncForTesting(
     bool (*new_func)(int)) {
   s_try_increment_worker_ref_count_ = new_func;
 }
 
 }  // namespace content