ServiceWorker: Factor out functions to collect client information from ServiceWorkerVersion

content/browser/service_worker/service_worker_client_utils.h

Index: content/browser/service_worker/service_worker_client_utils.h
diff --git a/content/browser/service_worker/service_worker_client_navigation_utils.h b/content/browser/service_worker/service_worker_client_utils.h
similarity index 65%
rename from content/browser/service_worker/service_worker_client_navigation_utils.h
rename to content/browser/service_worker/service_worker_client_utils.h
index 26aee5550bdc714882ff7bfa50b5f837e16af1d2..258268e1e0d2cbe93c698a3970add5fddb7fd2a8 100644
--- a/content/browser/service_worker/service_worker_client_navigation_utils.h
+++ b/content/browser/service_worker/service_worker_client_utils.h
@@ -2,10 +2,11 @@
 // 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_CLIENT_NAVIGATION_UTILS_H_
-#define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CLIENT_NAVIGATION_UTILS_H_
+#ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CLIENT_UTILS_H_
+#define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CLIENT_UTILS_H_
 
 #include <string>
+#include <vector>
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
@@ -16,14 +17,18 @@ class GURL;
 namespace content {
 
 class ServiceWorkerContextCore;
+class ServiceWorkerVersion;
 struct ServiceWorkerClientInfo;
+struct ServiceWorkerClientQueryOptions;
 
-namespace service_worker_client_navigation_utils {
+namespace service_worker_client_utils {
 
 using NavigationCallback =
     base::Callback<void(ServiceWorkerStatusCode status,
                         const std::string& client_uuid,
                         const ServiceWorkerClientInfo& client_info)>;
+using ServiceWorkerClients = std::vector<ServiceWorkerClientInfo>;
+using ClientsCallback = base::Callback<void(ServiceWorkerClients* clients)>;
 
 // Opens a new window and navigates it to |url|. |callback| is called with the
 // window's client information on completion.
@@ -42,8 +47,14 @@ void NavigateClient(const GURL& url,
                     const base::WeakPtr<ServiceWorkerContextCore>& context,
                     const NavigationCallback& callback);
 
-}  // namespace service_worker_client_navigation_utils
+// Collects clients matched with |options|. |callback| is called with the client
+// information sorted in MRU order (most recently focused order) on completion.
+void GetClients(const base::WeakPtr<ServiceWorkerVersion>& controller,
+                const ServiceWorkerClientQueryOptions& options,
+                const ClientsCallback& callback);
+
+}  // namespace service_worker_client_utils
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CLIENT_NAVIGATION_UTILS_H_
+#endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CLIENT_UTILS_H_