Add origins argument to registerForeignFetchScopes.

content/browser/service_worker/service_worker_version.h

Index: content/browser/service_worker/service_worker_version.h
diff --git a/content/browser/service_worker/service_worker_version.h b/content/browser/service_worker/service_worker_version.h
index 4a9c2917b269644d51bbcc8b8a5dd904b5bf40fa..39f37855a03c6b297cf536a99264816426e0b764 100644
--- a/content/browser/service_worker/service_worker_version.h
+++ b/content/browser/service_worker/service_worker_version.h
@@ -149,6 +149,13 @@ class CONTENT_EXPORT ServiceWorkerVersion
     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);
@@ -577,7 +584,8 @@ class CONTENT_EXPORT ServiceWorkerVersion
                              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,
@@ -660,6 +668,7 @@ class CONTENT_EXPORT ServiceWorkerVersion
   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_;