| Index: components/web_view/test_runner/test_runner_application_delegate.cc
|
| diff --git a/components/web_view/test_runner/test_runner_application_delegate.cc b/components/web_view/test_runner/test_runner_application_delegate.cc
|
| index 7a39632146506bb7aff515a10248ee2dd7653329..64420779b227418bacc66f8c6c00761147bf860d 100644
|
| --- a/components/web_view/test_runner/test_runner_application_delegate.cc
|
| +++ b/components/web_view/test_runner/test_runner_application_delegate.cc
|
| @@ -39,7 +39,7 @@
|
|
|
| TestRunnerApplicationDelegate::~TestRunnerApplicationDelegate() {
|
| if (root_)
|
| - mus::ScopedViewPtr::DeleteViewOrViewManager(root_);
|
| + mojo::ScopedViewPtr::DeleteViewOrViewManager(root_);
|
| }
|
|
|
| void TestRunnerApplicationDelegate::LaunchURL(const GURL& test_url) {
|
| @@ -54,7 +54,7 @@
|
|
|
| void TestRunnerApplicationDelegate::Terminate() {
|
| if (root_)
|
| - mus::ScopedViewPtr::DeleteViewOrViewManager(root_);
|
| + mojo::ScopedViewPtr::DeleteViewOrViewManager(root_);
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| @@ -62,7 +62,7 @@
|
|
|
| void TestRunnerApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
|
| app_ = app;
|
| - mus::CreateSingleViewTreeHost(app_, this, &host_);
|
| + mojo::CreateSingleViewTreeHost(app_, this, &host_);
|
| }
|
|
|
| bool TestRunnerApplicationDelegate::ConfigureIncomingConnection(
|
| @@ -72,9 +72,9 @@
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// mus::ViewTreeDelegate implementation:
|
| +// mojo::ViewTreeDelegate implementation:
|
|
|
| -void TestRunnerApplicationDelegate::OnEmbed(mus::View* root) {
|
| +void TestRunnerApplicationDelegate::OnEmbed(mojo::View* root) {
|
| root_ = root;
|
|
|
| // If this is a sys-check, then terminate in the next cycle.
|
| @@ -107,7 +107,7 @@
|
| }
|
|
|
| void TestRunnerApplicationDelegate::OnConnectionLost(
|
| - mus::ViewTreeConnection* connection) {
|
| + mojo::ViewTreeConnection* connection) {
|
| root_ = nullptr;
|
| app_->Quit();
|
| }
|
|
|