ServiceWorker: Support non-window clients in Clients.matchAll (1/2 chromium)

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 f022be9d783b52aaff8025003fe1ac1144a3e12d..8865deb5a0666ac99cadf0c7d473edb002cebd87 100644
--- a/content/browser/service_worker/service_worker_version.h
+++ b/content/browser/service_worker/service_worker_version.h
@@ -319,6 +319,7 @@ class CONTENT_EXPORT ServiceWorkerVersion
   friend class ServiceWorkerVersionBrowserTest;
 
   typedef ServiceWorkerVersion self;
+  using ServiceWorkerClients = std::vector<ServiceWorkerClientInfo>;
 
   enum RequestType {
     REQUEST_ACTIVATE,
@@ -425,8 +426,15 @@ class CONTENT_EXPORT ServiceWorkerVersion
   void StartWorkerInternal(bool pause_after_download);
 
   void DidSkipWaiting(int request_id);
-  void DidGetClients(
-      int request_id, const std::vector<ServiceWorkerClientInfo>& clients);
+
+  void GetWindowClients(int request_id,
+                        const ServiceWorkerClientQueryOptions& options);
+  void DidGetWindowClients(int request_id,
+                           const ServiceWorkerClientQueryOptions& options,
+                           scoped_ptr<ServiceWorkerClients> clients);
+  void GetNonWindowClients(int request_id,
+                           const ServiceWorkerClientQueryOptions& options,
+                           ServiceWorkerClients* clients);
 
   // The timeout timer periodically calls OnTimeoutTimer, which stops the worker
   // if it is excessively idle or unresponsive to ping.