Add origins argument to registerForeignFetchScopes.

content/browser/service_worker/service_worker_version.cc

 // Copyright 2013 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/service_worker/service_worker_version.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <string>
@@ skipping 1288 matching lines @@
   embedded_worker_->SendMessage(ServiceWorkerMsg_ClaimClientsError(
       request_id, blink::WebServiceWorkerError::ErrorTypeAbort,
       base::ASCIIToUTF16(kClaimClientsShutdownErrorMesage)));
 }
 
 void ServiceWorkerVersion::OnPongFromWorker() {
   ping_controller_->OnPongReceived();
 }
 
 void ServiceWorkerVersion::OnRegisterForeignFetchScopes(
-    const std::vector<GURL>& sub_scopes) {
+    const std::vector<GURL>& sub_scopes,
+    const std::vector<GURL>& origins) {
   DCHECK(status() == INSTALLING || status() == REDUNDANT) << status();
   // Renderer should have already verified all these urls are inside the
   // worker's scope, but verify again here on the browser process side.
   GURL origin = scope_.GetOrigin();
   std::string scope_path = scope_.path();
   for (const GURL& url : sub_scopes) {
     if (!url.is_valid() || url.GetOrigin() != origin ||
         !base::StartsWith(url.path(), scope_path,
                           base::CompareCase::SENSITIVE)) {
       DVLOG(1) << "Received unexpected invalid URL from renderer process.";
       BrowserThread::PostTask(
           BrowserThread::UI, FROM_HERE,
           base::Bind(&KillEmbeddedWorkerProcess, embedded_worker_->process_id(),
                      RESULT_CODE_KILLED_BAD_MESSAGE));
       return;
     }
   }
-  foreign_fetch_scopes_.insert(foreign_fetch_scopes_.end(), sub_scopes.begin(),
-                               sub_scopes.end());
+  for (const GURL& url : origins) {
+    if (!url.is_valid()) {
+      DVLOG(1) << "Received unexpected invalid URL from renderer process.";
+      BrowserThread::PostTask(
+          BrowserThread::UI, FROM_HERE,
+          base::Bind(&KillEmbeddedWorkerProcess, embedded_worker_->process_id(),
+                     RESULT_CODE_KILLED_BAD_MESSAGE));
+      return;
+    }
+  }
+  set_foreign_fetch_scopes(sub_scopes);

[falken, 2016/02/03 02:17:31]

The previous code appended the scopes to the end, is this change intentional?

[Marijn Kruisselbrink, 2016/02/03 17:53:30]

Yes, this change is intentional. The spec always said to replace the subscopes,
so the old implementation was just wrong (although at least when it was only
scopes it might have somewhat sense to append instead; with both scopes and
origins I think that would just be confusing).

+  set_foreign_fetch_origins(origins);
 }
 
 void ServiceWorkerVersion::DidEnsureLiveRegistrationForStartWorker(
     const StatusCallback& callback,
     ServiceWorkerStatusCode status,
     const scoped_refptr<ServiceWorkerRegistration>& registration) {
   scoped_refptr<ServiceWorkerRegistration> protect = registration;
   if (status == SERVICE_WORKER_ERROR_NOT_FOUND) {
     // When the registration has already been deleted from the storage but its
     // active worker is still controlling clients, the event should be
@@ skipping 456 matching lines @@
 void ServiceWorkerVersion::OnBeginEvent() {
   if (should_exclude_from_uma_ || running_status() != RUNNING ||
       idle_time_.is_null()) {
     return;
   }
   ServiceWorkerMetrics::RecordTimeBetweenEvents(base::TimeTicks::Now() -
                                                 idle_time_);
 }
 
 }  // namespace content