Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 1218cb618dfc6964dd450fd4c2f544e594c7c667..4cc12fba8d46de9add5408aed007522719014061 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -834,7 +834,8 @@ RenderFrameImpl* RenderFrameImpl::CreateMainFrame( |
RenderFrameImpl* render_frame = |
RenderFrameImpl::Create(render_view, routing_id); |
WebLocalFrame* web_frame = WebLocalFrame::create( |
- blink::WebTreeScopeType::Document, render_frame, opener); |
+ blink::WebTreeScopeType::Document, render_frame, opener, |
+ &render_frame->blink_service_registry_wrapper_); |
render_frame->BindToWebFrame(web_frame); |
render_view->webview()->setMainFrame(web_frame); |
render_frame->render_widget_ = RenderWidget::CreateForFrame( |
@@ -884,7 +885,8 @@ void RenderFrameImpl::CreateFrame( |
WebString::fromUTF8(replicated_state.unique_name), |
replicated_state.sandbox_flags, render_frame, |
previous_sibling_web_frame, frame_owner_properties, |
- ResolveOpener(opener_routing_id, nullptr)); |
+ ResolveOpener(opener_routing_id, nullptr), |
+ &render_frame->blink_service_registry_wrapper_); |
// The RenderFrame is created and inserted into the frame tree in the above |
// call to createLocalChild. |
@@ -903,7 +905,7 @@ void RenderFrameImpl::CreateFrame( |
render_frame->proxy_routing_id_ = proxy_routing_id; |
web_frame = blink::WebLocalFrame::createProvisional( |
render_frame, proxy->web_frame(), replicated_state.sandbox_flags, |
- frame_owner_properties); |
+ frame_owner_properties, &render_frame->blink_service_registry_wrapper_); |
} |
render_frame->BindToWebFrame(web_frame); |
CHECK(parent_routing_id != MSG_ROUTING_NONE || !web_frame->parent()); |
@@ -1017,6 +1019,7 @@ RenderFrameImpl::RenderFrameImpl(const CreateParams& params) |
geolocation_dispatcher_(NULL), |
push_messaging_dispatcher_(NULL), |
presentation_dispatcher_(NULL), |
+ blink_service_registry_wrapper_(&service_registry_), |
screen_orientation_dispatcher_(NULL), |
manifest_manager_(NULL), |
accessibility_mode_(AccessibilityModeOff), |
@@ -2607,8 +2610,9 @@ blink::WebFrame* RenderFrameImpl::createChildFrame( |
// Create the RenderFrame and WebLocalFrame, linking the two. |
RenderFrameImpl* child_render_frame = RenderFrameImpl::Create( |
render_view_.get(), child_routing_id); |
- blink::WebLocalFrame* web_frame = |
- WebLocalFrame::create(scope, child_render_frame); |
+ blink::WebLocalFrame* web_frame = WebLocalFrame::create( |
+ scope, child_render_frame, nullptr, |
+ &child_render_frame->blink_service_registry_wrapper_); |
child_render_frame->BindToWebFrame(web_frame); |
// Add the frame to the frame tree and initialize it. |