ServiceWorker: Remove wildcard from scope matching (Chromium)

content/browser/service_worker/service_worker_provider_host_unittest.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 "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
 #include "content/browser/service_worker/service_worker_register_job.h"
 #include "content/browser/service_worker/service_worker_registration.h"
@@ skipping 14 matching lines @@
   virtual void SetUp() OVERRIDE {
     context_.reset(
         new ServiceWorkerContextCore(base::FilePath(),
                                      base::MessageLoopProxy::current(),
                                      base::MessageLoopProxy::current(),
                                      base::MessageLoopProxy::current(),
                                      NULL,
                                      NULL,
                                      NULL));
 
-    scope_ = GURL("http://www.example.com/*");
+    scope_ = GURL("http://www.example.com/");
     script_url_ = GURL("http://www.example.com/service_worker.js");
     registration_ = new ServiceWorkerRegistration(
         scope_, script_url_, 1L, context_->AsWeakPtr());
     version_ = new ServiceWorkerVersion(
         registration_,
         1L, context_->AsWeakPtr());
 
     // Prepare provider hosts (for the same process).
     scoped_ptr<ServiceWorkerProviderHost> host1(new ServiceWorkerProviderHost(
         kRenderProcessId, 1 /* provider_id */,
@@ skipping 150 matching lines @@
   base::WeakPtr<ServiceWorkerProviderHost> provider_host3_;
 
  private:
   int64 next_provider_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerProviderHostWaitingVersionTest);
 };
 
 TEST_F(ServiceWorkerProviderHostWaitingVersionTest,
        AssociateInstallingVersionToDocuments) {
-  const GURL scope1("http://www.example.com/*");
+  const GURL scope1("http://www.example.com/");
   const GURL script_url1("http://www.example.com/service_worker1.js");
   scoped_refptr<ServiceWorkerRegistration> registration1(
       new ServiceWorkerRegistration(
           scope1, script_url1, 1L, context_->AsWeakPtr()));
   scoped_refptr<ServiceWorkerVersion> version1(
       new ServiceWorkerVersion(registration1, 1L, context_->AsWeakPtr()));
 
   ServiceWorkerRegisterJob::AssociateInstallingVersionToDocuments(
       context_->AsWeakPtr(), version1);
   EXPECT_EQ(version1.get(), provider_host1_->installing_version());
@@ skipping 23 matching lines @@
   // version2.
   ServiceWorkerRegisterJob::AssociateInstallingVersionToDocuments(
       context_->AsWeakPtr(), version3);
   EXPECT_EQ(version2.get(), provider_host1_->installing_version());
   EXPECT_EQ(version2.get(), provider_host2_->installing_version());
   EXPECT_EQ(NULL, provider_host3_->installing_version());
 }
 
 TEST_F(ServiceWorkerProviderHostWaitingVersionTest,
        DisassociateVersionFromDocuments) {
-  const GURL scope1("http://www.example.com/*");
+  const GURL scope1("http://www.example.com/");
   const GURL script_url1("http://www.example.com/service_worker.js");
   scoped_refptr<ServiceWorkerRegistration> registration1(
       new ServiceWorkerRegistration(
           scope1, script_url1, 1L, context_->AsWeakPtr()));
   scoped_refptr<ServiceWorkerVersion> version1(
       new ServiceWorkerVersion(registration1, 1L, context_->AsWeakPtr()));
 
-  const GURL scope2("http://www.example.ca/*");
+  const GURL scope2("http://www.example.ca/");
   const GURL script_url2("http://www.example.ca/service_worker.js");
   scoped_refptr<ServiceWorkerRegistration> registration2(
       new ServiceWorkerRegistration(
           scope2, script_url2, 2L, context_->AsWeakPtr()));
   scoped_refptr<ServiceWorkerVersion> version2(
       new ServiceWorkerVersion(registration2, 2L, context_->AsWeakPtr()));
 
   ServiceWorkerRegisterJob::AssociateInstallingVersionToDocuments(
       context_->AsWeakPtr(), version1);
   ServiceWorkerRegisterJob::AssociateInstallingVersionToDocuments(
       context_->AsWeakPtr(), version2);
 
   // Host1 and host2 are associated with version1 as a waiting version, whereas
   // host3 is associated with version2.
   EXPECT_EQ(version1.get(), provider_host1_->installing_version());
   EXPECT_EQ(version1.get(), provider_host2_->installing_version());
   EXPECT_EQ(version2.get(), provider_host3_->installing_version());
 
   // Disassociate version1 from host1 and host2.
   ServiceWorkerRegisterJob::DisassociateVersionFromDocuments(
       context_->AsWeakPtr(), version1);
   EXPECT_EQ(NULL, provider_host1_->installing_version());
   EXPECT_EQ(NULL, provider_host2_->installing_version());
   EXPECT_EQ(version2.get(), provider_host3_->installing_version());
 }
 
 }  // namespace content