summaryrefslogtreecommitdiffstats
path: root/content/browser/webui/web_ui_mojo_browsertest.cc
diff options
context:
space:
mode:
authorjamesr <jamesr@chromium.org>2014-11-18 17:35:28 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-19 01:35:49 +0000
commita9125266d3fc89ff0bfd4c3a05bf2f31ffaeff1f (patch)
tree954602a17f1bfd7fd9d10c255360f75a6ada0d28 /content/browser/webui/web_ui_mojo_browsertest.cc
parent558999147d4fdfd1ae7ee79cfa1c6599eab47d57 (diff)
downloadchromium_src-a9125266d3fc89ff0bfd4c3a05bf2f31ffaeff1f.zip
chromium_src-a9125266d3fc89ff0bfd4c3a05bf2f31ffaeff1f.tar.gz
chromium_src-a9125266d3fc89ff0bfd4c3a05bf2f31ffaeff1f.tar.bz2
Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a
Includes updates to ipc/mojo/ipc_channel_mojo.cc for mojo::embedder API changes and updates to use mojo::Binding<> in ui/keyboard and device/battery. Review URL: https://codereview.chromium.org/728133002 Cr-Commit-Position: refs/heads/master@{#304731}
Diffstat (limited to 'content/browser/webui/web_ui_mojo_browsertest.cc')
-rw-r--r--content/browser/webui/web_ui_mojo_browsertest.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc
index 9830f1d..d967230 100644
--- a/content/browser/webui/web_ui_mojo_browsertest.cc
+++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -82,9 +82,6 @@ class PingBrowserTargetImpl : public BrowserTargetImpl {
~PingBrowserTargetImpl() override {}
- // mojo::InterfaceImpl<BrowserTarget> overrides:
- void OnConnectionEstablished() override { client()->Ping(); }
-
// Quit the RunLoop when called.
void PingResponse() override {
got_message = true;
@@ -134,6 +131,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();
}
private: