diff options
| author | sammc@chromium.org <sammc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 00:19:55 +0000 |
|---|---|---|
| committer | sammc@chromium.org <sammc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 00:19:55 +0000 |
| commit | 3815009dde505d9a7372bef2465ccb37cb640520 (patch) | |
| tree | c119393871cc4c49da5f4e0a3f3f07c5552d1ba7 /content/browser/webui/web_ui_mojo_browsertest.cc | |
| parent | f1faeb003e654efaf5b50207383c56fce5d65d84 (diff) | |
| download | chromium_src-3815009dde505d9a7372bef2465ccb37cb640520.zip chromium_src-3815009dde505d9a7372bef2465ccb37cb640520.tar.gz chromium_src-3815009dde505d9a7372bef2465ccb37cb640520.tar.bz2 | |
Support exposing Mojo services between render frames, render threads, and their respective hosts.
This introduces ServiceRegistry as an abstraction around providing
services to and accessing services from a remote peer. In particular,
this adds peered service registries to RenderProcessHost and
RenderThread, and to RenderFrameHost and RenderFrame - the RenderFrame
setup is implemented using the RenderProcessHost/RenderThread
ServiceRegistry pair.
This replaces the existing WebUI handle setup by adding a webUI
controller service to the frame host registry and a corresponding
request for the webUI controller service to the frame registry.
BUG=386155
Review URL: https://codereview.chromium.org/285333003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279557 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/webui/web_ui_mojo_browsertest.cc')
| -rw-r--r-- | content/browser/webui/web_ui_mojo_browsertest.cc | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc index 5007a8d..6261316 100644 --- a/content/browser/webui/web_ui_mojo_browsertest.cc +++ b/content/browser/webui/web_ui_mojo_browsertest.cc @@ -12,15 +12,19 @@ #include "base/strings/string_util.h" #include "content/browser/webui/web_ui_controller_factory_registry.h" #include "content/public/browser/browser_context.h" +#include "content/public/browser/render_frame_host.h" +#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui_controller.h" #include "content/public/browser/web_ui_data_source.h" #include "content/public/common/content_paths.h" #include "content/public/common/content_switches.h" +#include "content/public/common/service_registry.h" #include "content/public/common/url_utils.h" #include "content/public/test/content_browser_test.h" #include "content/public/test/content_browser_test_utils.h" +#include "content/shell/browser/shell.h" #include "content/test/data/web_ui_test_mojo_bindings.mojom.h" #include "grit/content_resources.h" #include "mojo/common/test/test_utils.h" @@ -125,13 +129,18 @@ class PingTestWebUIController : public TestWebUIController { PingTestWebUIController(WebUI* web_ui, base::RunLoop* run_loop) : TestWebUIController(web_ui, run_loop) { } + virtual ~PingTestWebUIController() {} // WebUIController overrides: virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE { - mojo::MessagePipe pipe; - browser_target_.reset( - new PingBrowserTargetImpl(pipe.handle0.Pass(), run_loop_)); - render_view_host->SetWebUIHandle(pipe.handle1.Pass()); + render_view_host->GetMainFrame()->GetServiceRegistry()->AddService( + "webui_controller", + base::Bind(&PingTestWebUIController::CreateHandler, + base::Unretained(this))); + } + + void CreateHandler(mojo::ScopedMessagePipeHandle handle) { + browser_target_.reset(new PingBrowserTargetImpl(handle.Pass(), run_loop_)); } private: @@ -212,6 +221,19 @@ IN_PROC_BROWSER_TEST_F(WebUIMojoTest, EndToEndPing) { // RunLoop is quit when message received from page. run_loop.Run(); EXPECT_TRUE(got_message); + + // Check that a second render frame in the same renderer process works + // correctly. + Shell* other_shell = CreateBrowser(); + got_message = false; + base::RunLoop other_run_loop; + factory()->set_run_loop(&other_run_loop); + NavigateToURL(other_shell, test_url); + // RunLoop is quit when message received from page. + other_run_loop.Run(); + EXPECT_TRUE(got_message); + EXPECT_EQ(shell()->web_contents()->GetRenderProcessHost(), + other_shell->web_contents()->GetRenderProcessHost()); } } // namespace |