Add Client Attribute to FetchEvent- Chromium Side.

content/renderer/cache_storage/cache_storage_dispatcher.cc

 // Copyright 2014 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/renderer/cache_storage/cache_storage_dispatcher.h"
 
 #include <map>
 #include <string>
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_local.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/cache_storage/cache_storage_messages.h"
+#include "content/common/service_worker/service_worker_client_info.h"
 #include "content/public/common/referrer.h"
+#include "content/public/common/request_context_frame_type.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/service_worker/service_worker_type_util.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerCache.h"
+#include "third_party/WebKit/public/platform/WebServiceWorkerClientsInfo.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerRequest.h"
 #include "third_party/WebKit/public/platform/WebServiceWorkerResponse.h"
 
 using base::TimeTicks;
 
 namespace content {
 
 using blink::WebServiceWorkerCacheStorage;
 using blink::WebServiceWorkerCacheError;
 using blink::WebServiceWorkerRequest;
 
 static base::LazyInstance<base::ThreadLocalPointer<CacheStorageDispatcher>>::
     Leaky g_cache_storage_dispatcher_tls = LAZY_INSTANCE_INITIALIZER;
 
 namespace {
 
 CacheStorageDispatcher* const kHasBeenDeleted =
     reinterpret_cast<CacheStorageDispatcher*>(0x1);
 
+ServiceWorkerClientInfo ToServiceWorkerClientInfo(

[jsbell, 2015/05/06 16:53:43]

For consistency with other functions in this class, this should be named
'ClientInfoFromWebClientInfo'

(I personally prefer the 'ToXYZ' naming used in the service_worker_context
files, but we should match what's in use here)

[Paritosh Kumar, 2015/05/07 12:03:13]

Done. Thanks.

+    const blink::WebServiceWorkerClientInfo& web_client_info) {
+  ServiceWorkerClientInfo client_info;
+
+  client_info.client_uuid = base::UTF16ToUTF8(web_client_info.uuid);
+  client_info.page_visibility_state = web_client_info.pageVisibilityState;
+  client_info.is_focused = web_client_info.isFocused;
+  client_info.url = web_client_info.url;
+  client_info.frame_type =

[jsbell, 2015/05/06 16:53:43]

Note for other reviewers:

The static_cast<> is used elsewhere and we have matching-enums assertions in
chromium/src/content/child/web_url_loader_impl.cc

(Standard conversion functions - or just using the blink enums everywhere -
would be better, but not in this CL) 

[falken, 2015/05/07 04:13:42]

Thanks :)

+      static_cast<RequestContextFrameType>(web_client_info.frameType);
+  client_info.client_type = web_client_info.clientType;
+
+  return client_info;
+}
+
 ServiceWorkerFetchRequest FetchRequestFromWebRequest(
     const blink::WebServiceWorkerRequest& web_request) {
   ServiceWorkerHeaderMap headers;
   GetServiceWorkerHeaderMapFromWebRequest(web_request, &headers);
 
   return ServiceWorkerFetchRequest(
       web_request.url(), base::UTF16ToASCII(web_request.method()), headers,
       Referrer(web_request.referrerUrl(), web_request.referrerPolicy()),
-      web_request.isReload());
+      web_request.isReload(), ToServiceWorkerClientInfo(web_request.client()));
 }
 
 void PopulateWebRequestFromFetchRequest(
     const ServiceWorkerFetchRequest& request,
     blink::WebServiceWorkerRequest* web_request) {
   web_request->setURL(request.url);
   web_request->setMethod(base::ASCIIToUTF16(request.method));
   for (ServiceWorkerHeaderMap::const_iterator i = request.headers.begin(),
                                               end = request.headers.end();
        i != end; ++i) {
@@ skipping 608 matching lines @@
 CacheStorageDispatcher::WebResponsesFromResponses(
     const std::vector<ServiceWorkerResponse>& responses) {
   blink::WebVector<blink::WebServiceWorkerResponse> web_responses(
       responses.size());
   for (size_t i = 0; i < responses.size(); ++i)
     PopulateWebResponseFromResponse(responses[i], &(web_responses[i]));
   return web_responses;
 }
 
 }  // namespace content