Support dispatching ServiceWorker FetchEvent and receiving response

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 c4cd44b6d71205ca68628a8e775e06874f08507a..afacd0487d8359b01a1ae90febbaec083c1c8e92 100644
--- a/content/browser/service_worker/service_worker_version.cc
+++ b/content/browser/service_worker/service_worker_version.cc
@@ -77,15 +77,15 @@ void HandleInstallFinished(const StatusCallback& callback,
 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