Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1093)

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2098743002: Always enable register local implementaions into remote interfaces of rfh. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | services/shell/public/cpp/lib/interface_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index fadeeca42041cb03120150ffe39978fa7c35804d..46ada0b1e700ce72a6ab69643d9a275db63bbc12 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -2394,6 +2394,11 @@ void RenderFrameHostImpl::SetUpMojoIfNeeded() {
return;
interface_registry_.reset(new shell::InterfaceRegistry(nullptr));
+
+ // Even RenderProcessHost has no remote interfaces, such as
+ // MockRenderProcessHost, here still create |remote_interfaces_| to enable
+ // test codes register local implementations.
+ remote_interfaces_.reset(new shell::InterfaceProvider);
Ben Goodger (Google) 2016/06/29 17:55:54 Is this blocking something you want to do? I don't
leonhsl(Using Gerrit) 2016/06/29 22:25:33 In my another CL https://codereview.chromium.org/
if (!GetProcess()->GetRemoteInterfaces())
return;
@@ -2407,7 +2412,6 @@ void RenderFrameHostImpl::SetUpMojoIfNeeded() {
shell::mojom::InterfaceProviderPtr remote_interfaces;
shell::mojom::InterfaceProviderRequest remote_interfaces_request =
GetProxy(&remote_interfaces);
- remote_interfaces_.reset(new shell::InterfaceProvider);
remote_interfaces_->Bind(std::move(remote_interfaces));
frame_->GetInterfaceProvider(std::move(remote_interfaces_request));
« no previous file with comments | « no previous file | services/shell/public/cpp/lib/interface_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698