Revert of Gather the ServiceWorker client information in the browser process.

content/renderer/service_worker/service_worker_script_context.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/service_worker/service_worker_script_context.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/trace_event/trace_event.h"
 #include "content/child/notifications/notification_data_conversions.h"
@@ skipping 54 matching lines @@
     RequestContextType request_context_type) {
   return static_cast<blink::WebURLRequest::RequestContext>(
       request_context_type);
 }
 
 blink::WebURLRequest::FrameType GetBlinkFrameType(
     RequestContextFrameType frame_type) {
   return static_cast<blink::WebURLRequest::FrameType>(frame_type);
 }
 
-blink::WebServiceWorkerClientInfo
-ToWebServiceWorkerClientInfo(const ServiceWorkerClientInfo& client_info) {
-  DCHECK(client_info.IsValid());
-
-  blink::WebServiceWorkerClientInfo web_client_info;
-
-  web_client_info.clientID = client_info.client_id;
-  web_client_info.pageVisibilityState = client_info.page_visibility_state;
-  web_client_info.isFocused = client_info.is_focused;
-  web_client_info.url = client_info.url;
-  web_client_info.frameType = GetBlinkFrameType(client_info.frame_type);
-
-  return web_client_info;
-}
-
 }  // namespace
 
 ServiceWorkerScriptContext::ServiceWorkerScriptContext(
     EmbeddedWorkerContextClient* embedded_context,
     blink::WebServiceWorkerContextProxy* proxy)
     : cache_storage_dispatcher_(new ServiceWorkerCacheStorageDispatcher(this)),
       embedded_context_(embedded_context),
       proxy_(proxy) {
 }
 
@@ skipping 328 matching lines @@
   blink::WebServiceWorkerClientsCallbacks* callbacks =
       pending_clients_callbacks_.Lookup(request_id);
   if (!callbacks) {
     NOTREACHED() << "Got stray response: " << request_id;
     return;
   }
   scoped_ptr<blink::WebServiceWorkerClientsInfo> info(
       new blink::WebServiceWorkerClientsInfo);
   blink::WebVector<blink::WebServiceWorkerClientInfo> convertedClients(
       clients.size());
-  for (size_t i = 0; i < clients.size(); ++i)
-    convertedClients[i] = ToWebServiceWorkerClientInfo(clients[i]);
+  for (size_t i = 0; i < clients.size(); ++i) {
+    convertedClients[i].clientID = clients[i].client_id;
+    convertedClients[i].pageVisibilityState = clients[i].page_visibility_state;
+    convertedClients[i].isFocused = clients[i].is_focused;
+    convertedClients[i].url = clients[i].url;
+    convertedClients[i].frameType =
+        static_cast<blink::WebURLRequest::FrameType>(clients[i].frame_type);
+  }
   info->clients.swap(convertedClients);
   callbacks->onSuccess(info.release());
   pending_clients_callbacks_.Remove(request_id);
 }
 
 void ServiceWorkerScriptContext::OnFocusClientResponse(int request_id,
                                                        bool result) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerScriptContext::OnFocusClientResponse");
   blink::WebServiceWorkerClientFocusCallback* callback =
@@ skipping 13 matching lines @@
       pending_skip_waiting_callbacks_.Lookup(request_id);
   if (!callbacks) {
     NOTREACHED() << "Got stray response: " << request_id;
     return;
   }
   callbacks->onSuccess();
   pending_skip_waiting_callbacks_.Remove(request_id);
 }
 
 }  // namespace content