| Index: content/common/service_worker/service_worker_messages.h | 
| diff --git a/content/common/service_worker/service_worker_messages.h b/content/common/service_worker/service_worker_messages.h | 
| index c11a94ba9ff733a6506ff3a6cb8749220a8e352b..61301808301987eb69fb7263f1dbe0dc54887fdb 100644 | 
| --- a/content/common/service_worker/service_worker_messages.h | 
| +++ b/content/common/service_worker/service_worker_messages.h | 
| @@ -47,6 +47,9 @@ IPC_ENUM_TRAITS_MAX_VALUE(blink::WebServiceWorkerResponseError, | 
| IPC_ENUM_TRAITS_MAX_VALUE(blink::WebServiceWorkerClientType, | 
| blink::kWebServiceWorkerClientTypeLast) | 
|  | 
| +IPC_ENUM_TRAITS_MAX_VALUE(blink::WebServiceWorkerUpdateViaCache, | 
| +                          blink::WebServiceWorkerUpdateViaCache::kLast) | 
| + | 
| IPC_ENUM_TRAITS_MAX_VALUE(content::ServiceWorkerProviderType, | 
| content::SERVICE_WORKER_PROVIDER_TYPE_LAST) | 
|  | 
| @@ -106,9 +109,14 @@ IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerObjectInfo) | 
| IPC_STRUCT_TRAITS_MEMBER(version_id) | 
| IPC_STRUCT_TRAITS_END() | 
|  | 
| +IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerRegistrationOptions) | 
| +  IPC_STRUCT_TRAITS_MEMBER(scope) | 
| +  IPC_STRUCT_TRAITS_MEMBER(update_via_cache) | 
| +IPC_STRUCT_TRAITS_END() | 
| + | 
| IPC_STRUCT_TRAITS_BEGIN(content::ServiceWorkerRegistrationObjectInfo) | 
| IPC_STRUCT_TRAITS_MEMBER(handle_id) | 
| -  IPC_STRUCT_TRAITS_MEMBER(scope) | 
| +  IPC_STRUCT_TRAITS_MEMBER(options) | 
| IPC_STRUCT_TRAITS_MEMBER(registration_id) | 
| IPC_STRUCT_TRAITS_END() | 
|  | 
| @@ -152,8 +160,8 @@ IPC_MESSAGE_CONTROL5(ServiceWorkerHostMsg_RegisterServiceWorker, | 
| int /* thread_id */, | 
| int /* request_id */, | 
| int /* provider_id */, | 
| -                     GURL /* scope */, | 
| -                     GURL /* script_url */) | 
| +                     GURL /* script_url */, | 
| +                     content::ServiceWorkerRegistrationOptions) | 
|  | 
| IPC_MESSAGE_CONTROL4(ServiceWorkerHostMsg_UpdateServiceWorker, | 
| int /* thread_id */, | 
|  |