| Index: components/web_view/test_runner/test_runner_application_delegate.h
|
| diff --git a/components/web_view/test_runner/test_runner_application_delegate.h b/components/web_view/test_runner/test_runner_application_delegate.h
|
| index 6addcaeeadf564abd208799171803e93ad2f1d62..0e283bebc9b0ccab5aa3898477a1a922bd42c1aa 100644
|
| --- a/components/web_view/test_runner/test_runner_application_delegate.h
|
| +++ b/components/web_view/test_runner/test_runner_application_delegate.h
|
| @@ -27,7 +27,7 @@
|
|
|
| class TestRunnerApplicationDelegate
|
| : public mojo::ApplicationDelegate,
|
| - public mus::ViewTreeDelegate,
|
| + public mojo::ViewTreeDelegate,
|
| public mojom::WebViewClient,
|
| public LayoutTestRunner,
|
| public mojo::InterfaceFactory<LayoutTestRunner> {
|
| @@ -44,9 +44,9 @@
|
| bool ConfigureIncomingConnection(
|
| mojo::ApplicationConnection* connection) override;
|
|
|
| - // mus::ViewTreeDelegate:
|
| - void OnEmbed(mus::View* root) override;
|
| - void OnConnectionLost(mus::ViewTreeConnection* connection) override;
|
| + // mojo::ViewTreeDelegate:
|
| + void OnEmbed(mojo::View* root) override;
|
| + void OnConnectionLost(mojo::ViewTreeConnection* connection) override;
|
|
|
| // mojom::WebViewClient:
|
| void TopLevelNavigate(mojo::URLRequestPtr request) override;
|
| @@ -66,8 +66,8 @@
|
| mojo::ApplicationImpl* app_;
|
| mojo::ViewTreeHostPtr host_;
|
|
|
| - mus::View* root_;
|
| - mus::View* content_;
|
| + mojo::View* root_;
|
| + mojo::View* content_;
|
| scoped_ptr<WebView> web_view_;
|
|
|
| scoped_ptr<test_runner::TestInfoExtractor> test_extractor_;
|
|
|