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 24d38d00ffa81e4ea55ba1ce372c6f9e9ed9067f..35c41f6cb39f142681d8932bd2b0b97d0fdc342c 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 @@ namespace web_view { |
class TestRunnerApplicationDelegate |
: public mojo::ApplicationDelegate, |
- public mojo::ViewTreeDelegate, |
+ public mus::ViewTreeDelegate, |
public mojom::WebViewClient, |
public LayoutTestRunner, |
public mojo::InterfaceFactory<LayoutTestRunner> { |
@@ -44,9 +44,9 @@ class TestRunnerApplicationDelegate |
bool ConfigureIncomingConnection( |
mojo::ApplicationConnection* connection) override; |
- // mojo::ViewTreeDelegate: |
- void OnEmbed(mojo::View* root) override; |
- void OnConnectionLost(mojo::ViewTreeConnection* connection) override; |
+ // mus::ViewTreeDelegate: |
+ void OnEmbed(mus::View* root) override; |
+ void OnConnectionLost(mus::ViewTreeConnection* connection) override; |
// mojom::WebViewClient: |
void TopLevelNavigate(mojo::URLRequestPtr request) override; |
@@ -65,8 +65,8 @@ class TestRunnerApplicationDelegate |
mojo::ApplicationImpl* app_; |
mojo::ViewTreeHostPtr host_; |
- mojo::View* root_; |
- mojo::View* content_; |
+ mus::View* root_; |
+ mus::View* content_; |
scoped_ptr<WebView> web_view_; |
scoped_ptr<test_runner::TestInfoExtractor> test_extractor_; |