Service Worker: (Re-commit) Add FetchEvent.clientId

content/common/service_worker/service_worker_types.h

Index: content/common/service_worker/service_worker_types.h
diff --git a/content/common/service_worker/service_worker_types.h b/content/common/service_worker/service_worker_types.h
index 3f9c546676ab9b936464357f1a2af060acabceaf..d3a9f8f2a990403886a296edd1faa053eb677495 100644
--- a/content/common/service_worker/service_worker_types.h
+++ b/content/common/service_worker/service_worker_types.h
@@ -126,6 +126,7 @@ struct CONTENT_EXPORT ServiceWorkerFetchRequest {
   ~ServiceWorkerFetchRequest();
 
   FetchRequestMode mode;
+  bool is_main_resource_load;
   RequestContextType request_context_type;
   RequestContextFrameType frame_type;
   GURL url;
@@ -136,6 +137,7 @@ struct CONTENT_EXPORT ServiceWorkerFetchRequest {
   Referrer referrer;
   FetchCredentialsMode credentials_mode;
   FetchRedirectMode redirect_mode;
+  std::string client_id;
   bool is_reload;
 };