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

content/browser/shared_worker/shared_worker_instance.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_instance.h"
 
 #include "base/logging.h"
 
 namespace content {
 
@@ skipping 39 matching lines @@
     return false;
 
   // We must be in the same storage partition otherwise sharing will violate
   // isolation.
   if (!partition_id_.Equals(partition_id))
     return false;
 
   if (url_.GetOrigin() != match_url.GetOrigin())
     return false;
 
-  if (name_.empty() && match_name.empty())
-    return url_ == match_url;
-
-  return name_ == match_name;
+  if (name_ != match_name || url_ != match_url)
+    return false;
+  return true;
 }
 
 bool SharedWorkerInstance::Matches(const SharedWorkerInstance& other) const {
   return Matches(other.url(),
                  other.name(),
                  other.partition_id(),
                  other.resource_context());
 }
 
 }  // namespace content