Wire provider_id into scriptable API provider to start listening events

content/renderer/render_frame_impl.cc

 // Copyright 2013 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/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 991 matching lines @@
 }
 
 blink::WebCookieJar* RenderFrameImpl::cookieJar(blink::WebFrame* frame) {
   DCHECK(!frame_ || frame_ == frame);
   return &cookie_jar_;
 }
 
 blink::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider(
     blink::WebFrame* frame) {
   DCHECK(!frame_ || frame_ == frame);
-  // TODO(kinuko): Get the provider_id for the frame (via dataSource) and
-  // pass it to the WebServiceWorkerProviderImpl constructor.
+  // At this point we should have non-null data source.
+  DCHECK(frame->dataSource());
+  ServiceWorkerNetworkProvider* provider =
+      ServiceWorkerNetworkProvider::FromDocumentState(
+          DocumentState::FromDataSource(frame->dataSource()));
+  int provider_id = provider

[Tom Sepez, 2014/03/07 17:48:26]

style nit: ? and : at end of previous lines.

[kinuko, 2014/03/10 05:02:18]

Done.

+      ? provider->provider_id()
+      : kInvalidServiceWorkerProviderId;
   return new WebServiceWorkerProviderImpl(
-      ChildThread::current()->thread_safe_sender());
+      ChildThread::current()->thread_safe_sender(), provider_id);
 }
 
 void RenderFrameImpl::didAccessInitialDocument(blink::WebFrame* frame) {
   DCHECK(!frame_ || frame_ == frame);
   render_view_->didAccessInitialDocument(frame);
 }
 
 blink::WebFrame* RenderFrameImpl::createChildFrame(
     blink::WebFrame* parent,
     const blink::WebString& name) {
@@ skipping 1597 matching lines @@
       policy == blink::WebNavigationPolicyNewForegroundTab ||
       policy == blink::WebNavigationPolicyNewWindow ||
       policy == blink::WebNavigationPolicyNewPopup) {
     WebUserGestureIndicator::consumeUserGesture();
   }
 
   Send(new FrameHostMsg_OpenURL(routing_id_, params));
 }
 
 }  // namespace content