ServiceWorker: plumbing for ClientQueryOptions (2/2, chromium)

content/browser/service_worker/service_worker_version.cc

Index: content/browser/service_worker/service_worker_version.cc
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc
index d6468fda7154264c99632e318529d5820c923f16..77ab226c3280cf6d51a4767dceb30459746e282e 100644
--- a/content/browser/service_worker/service_worker_version.cc
+++ b/content/browser/service_worker/service_worker_version.cc
@@ -38,11 +38,10 @@ namespace content {
 typedef ServiceWorkerVersion::StatusCallback StatusCallback;
 typedef ServiceWorkerVersion::MessageCallback MessageCallback;
 
-class ServiceWorkerVersion::GetClientDocumentsCallback
-    : public base::RefCounted<GetClientDocumentsCallback> {
+class ServiceWorkerVersion::GetClientsCallback
+    : public base::RefCounted<GetClientsCallback> {
  public:
-  GetClientDocumentsCallback(int request_id,
-                             ServiceWorkerVersion* version)
+  GetClientsCallback(int request_id, ServiceWorkerVersion* version)
       : request_id_(request_id),
         version_(version) {
     DCHECK(version_);
@@ -54,14 +53,14 @@ class ServiceWorkerVersion::GetClientDocumentsCallback
   }
 
  private:
-  friend class base::RefCounted<GetClientDocumentsCallback>;
+  friend class base::RefCounted<GetClientsCallback>;
 
-  virtual ~GetClientDocumentsCallback() {
+  virtual ~GetClientsCallback() {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
     if (version_->running_status() == RUNNING) {
       version_->embedded_worker_->SendMessage(
-          ServiceWorkerMsg_DidGetClientDocuments(request_id_, clients_));
+          ServiceWorkerMsg_DidGetClients(request_id_, clients_));
     }
   }
 
@@ -69,7 +68,7 @@ class ServiceWorkerVersion::GetClientDocumentsCallback
   int request_id_;
   scoped_refptr<ServiceWorkerVersion> version_;
 
-  DISALLOW_COPY_AND_ASSIGN(GetClientDocumentsCallback);
+  DISALLOW_COPY_AND_ASSIGN(GetClientsCallback);
 };
 
 namespace {
@@ -899,8 +898,8 @@ void ServiceWorkerVersion::OnReportConsoleMessage(int source_identifier,
 bool ServiceWorkerVersion::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ServiceWorkerVersion, message)
-    IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_GetClientDocuments,
-                        OnGetClientDocuments)
+    IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_GetClients,
+                        OnGetClients)
     IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_ActivateEventFinished,
                         OnActivateEventFinished)
     IPC_MESSAGE_HANDLER(ServiceWorkerHostMsg_InstallEventFinished,
@@ -972,20 +971,23 @@ void ServiceWorkerVersion::DispatchActivateEventAfterStartWorker(
   }
 }
 
-void ServiceWorkerVersion::OnGetClientDocuments(int request_id) {
+void ServiceWorkerVersion::OnGetClients(
+    int request_id,
+    const ServiceWorkerClientQueryOptions& /* options */) {
+  // TODO(kinuko): Handle ClientQueryOptions. (crbug.com/455241, 460415 etc)
   if (controllee_by_id_.IsEmpty()) {
     if (running_status() == RUNNING) {
       embedded_worker_->SendMessage(
-          ServiceWorkerMsg_DidGetClientDocuments(request_id,
+          ServiceWorkerMsg_DidGetClients(request_id,
               std::vector<ServiceWorkerClientInfo>()));
     }
     return;
   }
-  scoped_refptr<GetClientDocumentsCallback> callback(
-      new GetClientDocumentsCallback(request_id, this));
+  scoped_refptr<GetClientsCallback> callback(
+      new GetClientsCallback(request_id, this));
   ControlleeByIDMap::iterator it(&controllee_by_id_);
   TRACE_EVENT0("ServiceWorker",
-               "ServiceWorkerVersion::OnGetClientDocuments");
+               "ServiceWorkerVersion::OnGetClients");
   while (!it.IsAtEnd()) {
     // TODO(mlamouri): we could coalesce those requests into one.
     it.GetCurrentValue()->GetClientInfo(
@@ -1385,7 +1387,7 @@ void ServiceWorkerVersion::DidClaimClients(
 
 void ServiceWorkerVersion::DidGetClientInfo(
     int client_id,
-    scoped_refptr<GetClientDocumentsCallback> callback,
+    scoped_refptr<GetClientsCallback> callback,
     const ServiceWorkerClientInfo& info) {
   // If the request to the provider_host returned an empty
   // ServiceWorkerClientInfo, that means that it wasn't possible to associate