Add origins argument to registerForeignFetchScopes.

content/browser/service_worker/service_worker_version.h

 // 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.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_VERSION_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_VERSION_H_
 
 #include <stdint.h>
 
 #include <functional>
@@ skipping 131 matching lines @@
   ServiceWorkerVersionInfo GetInfo();
   Status status() const { return status_; }
 
   const std::vector<GURL>& foreign_fetch_scopes() const {
     return foreign_fetch_scopes_;
   }
   void set_foreign_fetch_scopes(const std::vector<GURL>& scopes) {
     foreign_fetch_scopes_ = scopes;
   }
 
+  const std::vector<GURL>& foreign_fetch_origins() const {

[michaeln, 2016/02/03 21:27:21]

drive by: would it make sense to / is it possible to use the url::Origin class
for this?

[Marijn Kruisselbrink, 2016/02/04 19:30:07]

I'm not sure if it would make sense. It would certainly be possible, although
slightly clunky. There are various things missing from the url::Origin API,
which makes me wonder if something like this is what url::Origin was intended
for. One big issues is that there isn't really a way to persist a url::Origin.
It has a Serialize() method, but no easy way to recreate an Origin from that.
Although deserializing into a GURL and then converting that to a url::Origin
probably does the right thing anyway. And there are similar issues at the
blink<->content boundary. There are no conversions possible between
blink::WebSecurityOrigin and url::Origin, other than serializing to a string,
converting the string to a GURL and then creating a url::Origin from that
string.
Maybe these are just missing APIs that really should exist though, so maybe it
is worth reaching out to whoever owns the url::Origin code to figure out if
that's what I should be using here...

[Marijn Kruisselbrink, 2016/02/04 20:00:45]

Actually, the blink issues don't exist. I was looking at the wrong
WebSecurityOrigin.h file (somehow blink ended up with two copies of the class
that aren't actually identical....). So changing this probably makes sense.

+    return foreign_fetch_origins_;
+  }
+  void set_foreign_fetch_origins(const std::vector<GURL>& origins) {
+    foreign_fetch_origins_ = origins;
+  }
+
   // This sets the new status and also run status change callbacks
   // if there're any (see RegisterStatusChangeCallback).
   void SetStatus(Status status);
 
   // Registers status change callback. (This is for one-off observation,
   // the consumer needs to re-register if it wants to continue observing
   // status changes)
   void RegisterStatusChangeCallback(const base::Closure& callback);
 
   // Starts an embedded worker for this version.
@@ skipping 408 matching lines @@
                                 const std::string& client_uuid,
                                 const ServiceWorkerClientInfo& client);
   void OnSkipWaiting(int request_id);
   void OnClaimClients(int request_id);
   void OnPongFromWorker();
 
   void OnFocusClientFinished(int request_id,
                              const std::string& client_uuid,
                              const ServiceWorkerClientInfo& client);
 
-  void OnRegisterForeignFetchScopes(const std::vector<GURL>& sub_scopes);
+  void OnRegisterForeignFetchScopes(const std::vector<GURL>& sub_scopes,
+                                    const std::vector<GURL>& origins);
 
   void DidEnsureLiveRegistrationForStartWorker(
       const StatusCallback& callback,
       ServiceWorkerStatusCode status,
       const scoped_refptr<ServiceWorkerRegistration>& registration);
   void StartWorkerInternal();
 
   void DidSkipWaiting(int request_id);
 
   void OnGetClientsFinished(int request_id, ServiceWorkerClients* clients);
@@ skipping 62 matching lines @@
   // Called at the beginning of each Dispatch*Event function: records
   // the time elapsed since idle (generally the time since the previous
   // event ended).
   void OnBeginEvent();
 
   const int64_t version_id_;
   const int64_t registration_id_;
   const GURL script_url_;
   const GURL scope_;
   std::vector<GURL> foreign_fetch_scopes_;
+  std::vector<GURL> foreign_fetch_origins_;
 
   Status status_ = NEW;
   scoped_ptr<EmbeddedWorkerInstance> embedded_worker_;
   std::vector<StatusCallback> start_callbacks_;
   std::vector<StatusCallback> stop_callbacks_;
   std::vector<base::Closure> status_change_callbacks_;
 
   // Message callbacks. (Update HasInflightRequests() too when you update this
   // list.)
   IDMap<PendingRequest<FetchCallback>, IDMapOwnPointer> fetch_requests_;
@@ skipping 135 matching lines @@
 
   // At this point |this| can have been deleted, so don't do anything other
   // than returning.
 
   return true;
 }
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_VERSION_H_