| 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 f8a84332029ebe3682f07bea1b221e9b3e8a024e..4c49b814c205b76771fb125f93c2c8c279432217 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()
|
|
|
| TestRunnerApplicationDelegate::~TestRunnerApplicationDelegate() {
|
| if (root_)
|
| - mojo::ScopedViewPtr::DeleteViewOrViewManager(root_);
|
| + mus::ScopedViewPtr::DeleteViewOrViewManager(root_);
|
| }
|
|
|
| void TestRunnerApplicationDelegate::LaunchURL(const GURL& test_url) {
|
| @@ -55,7 +55,7 @@ void TestRunnerApplicationDelegate::LaunchURL(const GURL& test_url) {
|
|
|
| void TestRunnerApplicationDelegate::Terminate() {
|
| if (root_)
|
| - mojo::ScopedViewPtr::DeleteViewOrViewManager(root_);
|
| + mus::ScopedViewPtr::DeleteViewOrViewManager(root_);
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| @@ -63,7 +63,7 @@ void TestRunnerApplicationDelegate::Terminate() {
|
|
|
| void TestRunnerApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
|
| app_ = app;
|
| - mojo::CreateSingleViewTreeHost(app_, this, &host_);
|
| + mus::CreateSingleViewTreeHost(app_, this, &host_);
|
| }
|
|
|
| bool TestRunnerApplicationDelegate::ConfigureIncomingConnection(
|
| @@ -73,9 +73,9 @@ bool TestRunnerApplicationDelegate::ConfigureIncomingConnection(
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// mojo::ViewTreeDelegate implementation:
|
| +// mus::ViewTreeDelegate implementation:
|
|
|
| -void TestRunnerApplicationDelegate::OnEmbed(mojo::View* root) {
|
| +void TestRunnerApplicationDelegate::OnEmbed(mus::View* root) {
|
| root_ = root;
|
|
|
| // If this is a sys-check, then terminate in the next cycle.
|
| @@ -108,7 +108,7 @@ void TestRunnerApplicationDelegate::OnEmbed(mojo::View* root) {
|
| }
|
|
|
| void TestRunnerApplicationDelegate::OnConnectionLost(
|
| - mojo::ViewTreeConnection* connection) {
|
| + mus::ViewTreeConnection* connection) {
|
| root_ = nullptr;
|
| app_->Quit();
|
| }
|
|
|