Start of Chrome-side plumbing for ServiceWorker fetch

content/browser/service_worker/service_worker_version.cc

 // 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.
 
 #include "content/browser/service_worker/service_worker_version.h"
 
 #include "base/stl_util.h"
 #include "content/browser/service_worker/embedded_worker_instance.h"
 #include "content/browser/service_worker/embedded_worker_registry.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
@@ skipping 56 matching lines @@
 
   if (message.type() != ServiceWorkerHostMsg_InstallEventFinished::ID) {
     NOTREACHED() << "Got unexpected response for InstallEvent: "
                  << message.type();
     callback.Run(SERVICE_WORKER_ERROR_FAILED);
     return;
   }
   callback.Run(SERVICE_WORKER_OK);
 }
 
+void HandleFetchResponse(const StatusCallback& callback,
+                         ServiceWorkerStatusCode status,
+                         const IPC::Message& message) {
+  if (message.type() != ServiceWorkerHostMsg_FetchEventFinished::ID) {
+    NOTREACHED() << "Got unexpected response for FetchEvent: "
+                 << message.type();
+    callback.Run(SERVICE_WORKER_ERROR_FAILED);
+    return;
+  }
+  callback.Run(status);
+}
+
 }  // namespace
 
 ServiceWorkerVersion::ServiceWorkerVersion(
     ServiceWorkerRegistration* registration,
     EmbeddedWorkerRegistry* worker_registry,
     int64 version_id)
     : version_id_(version_id),
       is_shutdown_(false),
       registration_(registration),
       weak_factory_(this) {
@@ skipping 100 matching lines @@
 }
 
 void ServiceWorkerVersion::DispatchInstallEvent(
     int active_version_embedded_worker_id,
     const StatusCallback& callback) {
   SendMessageAndRegisterCallback(
       ServiceWorkerMsg_InstallEvent(active_version_embedded_worker_id),
       base::Bind(&HandleInstallFinished, callback));
 }
 
-bool ServiceWorkerVersion::DispatchFetchEvent(
-    const ServiceWorkerFetchRequest& request) {
-  if (status() != RUNNING)
-    return false;
-  return embedded_worker_->SendMessage(
-      kInvalidRequestId, ServiceWorkerMsg_FetchEvent(request))
-          == SERVICE_WORKER_OK;
+void ServiceWorkerVersion::DispatchFetchEvent(
+    const ServiceWorkerFetchRequest& request,
+    const StatusCallback& callback) {
+  // TODO(falken): Must check status() == RUNNING?
+  SendMessageAndRegisterCallback(

[kinuko, 2014/02/14 08:56:24]

SendMessageAndRegisterCallback internally checks if the worker's running and
will (try to) start it if it's not, so no worries about it (at least in this
layer)

[falken, 2014/02/19 05:32:19]

OK, I see. TODO removed.

+      ServiceWorkerMsg_FetchEvent(request),
+      base::Bind(&HandleFetchResponse, callback));
 }
 
 void ServiceWorkerVersion::AddProcessToWorker(int process_id) {
   DCHECK(!is_shutdown_);
   embedded_worker_->AddProcessReference(process_id);
 }
 
 void ServiceWorkerVersion::RemoveProcessToWorker(int process_id) {
   embedded_worker_->ReleaseProcessReference(process_id);
 }
@@ skipping 31 matching lines @@
   if (callback) {
     callback->Run(SERVICE_WORKER_OK, message);
     message_callbacks_.Remove(request_id);
     return;
   }
   NOTREACHED() << "Got unexpected message: " << request_id
                << " " << message.type();
 }
 
 }  // namespace content