Support dispatching ServiceWorker FetchEvent and receiving response

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 59 matching lines @@
                  << message.type();
     callback.Run(SERVICE_WORKER_ERROR_FAILED);
     return;
   }
   callback.Run(SERVICE_WORKER_OK);
 }
 
 void HandleFetchResponse(const ServiceWorkerVersion::FetchCallback& callback,
                          ServiceWorkerStatusCode status,
                          const IPC::Message& message) {
-  Tuple1<ServiceWorkerFetchResponse> response;
+  Tuple2<ServiceWorkerFetchEventResult, ServiceWorkerResponse> params;
   if (message.type() != ServiceWorkerHostMsg_FetchEventFinished::ID) {
     NOTREACHED() << "Got unexpected response for FetchEvent: "
                  << message.type();
-    callback.Run(SERVICE_WORKER_ERROR_FAILED, response.a);
+    callback.Run(SERVICE_WORKER_ERROR_FAILED, params.a, params.b);
     return;
   }
-  ServiceWorkerHostMsg_FetchEventFinished::Read(&message, &response);
-  callback.Run(status, response.a);
+  ServiceWorkerHostMsg_FetchEventFinished::Read(&message, &params);

[kinuko, 2014/03/04 06:39:17]

I think for 2+ parameters you can probably do this:

ServiceWorkerFetchEventResult result;
ServiceWorkerResponse response;
ServiceWorkerHostMsg_FetchEventFinished::Read(&message, &result, &response);

[falken, 2014/03/05 03:35:41]

Done.

+  callback.Run(status, params.a, params.b);
 }
 
 }  // namespace
 
 ServiceWorkerVersion::ServiceWorkerVersion(
     ServiceWorkerRegistration* registration,
     EmbeddedWorkerRegistry* worker_registry,
     int64 version_id)
     : version_id_(version_id),
       is_shutdown_(false),
@@ skipping 159 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