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

Unified Diff: content/browser/webui/web_ui_mojo_browsertest.cc

Issue 834153003: Remove usage of [Client=..] from web_ui_mojo test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | content/test/data/web_ui_mojo.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/webui/web_ui_mojo_browsertest.cc
diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc
index 722f2a5e3da34a9d83fe929153da1e71a8f348ee..274d4c1b7041eacf15e1c126351a34a541e41f0e 100644
--- a/content/browser/webui/web_ui_mojo_browsertest.cc
+++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -67,7 +67,13 @@ class BrowserTargetImpl : public mojo::InterfaceImpl<BrowserTarget> {
~BrowserTargetImpl() override {}
// mojo::InterfaceImpl<BrowserTarget> overrides:
- void PingResponse() override { NOTREACHED(); }
+ void Start(const mojo::Closure& closure) override {
+ closure.Run();
+ }
+ void Stop() override {
+ got_message = true;
+ run_loop_->Quit();
+ }
protected:
base::RunLoop* run_loop_;
@@ -76,23 +82,6 @@ class BrowserTargetImpl : public mojo::InterfaceImpl<BrowserTarget> {
DISALLOW_COPY_AND_ASSIGN(BrowserTargetImpl);
};
-class PingBrowserTargetImpl : public BrowserTargetImpl {
- public:
- explicit PingBrowserTargetImpl(base::RunLoop* run_loop)
- : BrowserTargetImpl(run_loop) {}
-
- ~PingBrowserTargetImpl() override {}
-
- // Quit the RunLoop when called.
- void PingResponse() override {
- got_message = true;
- run_loop_->Quit();
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PingBrowserTargetImpl);
-};
-
// WebUIController that sets up mojo bindings.
class TestWebUIController : public WebUIController {
public:
@@ -123,7 +112,7 @@ class PingTestWebUIController : public TestWebUIController {
~PingTestWebUIController() override {}
// WebUIController overrides:
- void RenderViewCreated(RenderViewHost* render_view_host) override {
+ void RenderViewCreated(RenderViewHost* render_view_host) override {
render_view_host->GetMainFrame()->GetServiceRegistry()->
AddService<BrowserTarget>(base::Bind(
&PingTestWebUIController::CreateHandler, base::Unretained(this)));
@@ -131,8 +120,7 @@ class PingTestWebUIController : public TestWebUIController {
void CreateHandler(mojo::InterfaceRequest<BrowserTarget> request) {
browser_target_.reset(mojo::WeakBindToRequest(
- new PingBrowserTargetImpl(run_loop_), &request));
- browser_target_->client()->Ping();
+ new BrowserTargetImpl(run_loop_), &request));
}
private:
« no previous file with comments | « no previous file | content/test/data/web_ui_mojo.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698