Index: components/mus/public/cpp/tests/mandoline_ui_services_test_base.cc |
diff --git a/components/mus/public/cpp/tests/view_manager_test_base.cc b/components/mus/public/cpp/tests/mandoline_ui_services_test_base.cc |
similarity index 65% |
rename from components/mus/public/cpp/tests/view_manager_test_base.cc |
rename to components/mus/public/cpp/tests/mandoline_ui_services_test_base.cc |
index 8ed4204fdcf3a3ed34430d79171de5e45b84ede7..f59339e8a297a7bc36998c708a17527fbe37f957 100644 |
--- a/components/mus/public/cpp/tests/view_manager_test_base.cc |
+++ b/components/mus/public/cpp/tests/mandoline_ui_services_test_base.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "components/mus/public/cpp/tests/view_manager_test_base.h" |
+#include "components/mus/public/cpp/tests/mandoline_ui_services_test_base.h" |
#include "base/bind.h" |
#include "base/message_loop/message_loop.h" |
@@ -13,7 +13,8 @@ |
#include "components/mus/public/cpp/view_tree_host_factory.h" |
#include "mojo/application/public/cpp/application_impl.h" |
-namespace mojo { |
+namespace mus { |
+ |
namespace { |
base::RunLoop* current_run_loop = nullptr; |
@@ -26,15 +27,15 @@ void TimeoutRunLoop(const base::Closure& timeout_task, bool* timeout) { |
} // namespace |
-ViewManagerTestBase::ViewManagerTestBase() |
+MandolineUIServicesTestBase::MandolineUIServicesTestBase() |
: most_recent_connection_(nullptr), |
window_manager_(nullptr), |
view_tree_connection_destroyed_(false) {} |
-ViewManagerTestBase::~ViewManagerTestBase() {} |
+MandolineUIServicesTestBase::~MandolineUIServicesTestBase() {} |
// static |
-bool ViewManagerTestBase::DoRunLoopWithTimeout() { |
+bool MandolineUIServicesTestBase::DoRunLoopWithTimeout() { |
if (current_run_loop != nullptr) |
return false; |
@@ -51,7 +52,7 @@ bool ViewManagerTestBase::DoRunLoopWithTimeout() { |
} |
// static |
-bool ViewManagerTestBase::QuitRunLoop() { |
+bool MandolineUIServicesTestBase::QuitRunLoop() { |
if (!current_run_loop) |
return false; |
@@ -60,7 +61,7 @@ bool ViewManagerTestBase::QuitRunLoop() { |
return true; |
} |
-void ViewManagerTestBase::SetUp() { |
+void MandolineUIServicesTestBase::SetUp() { |
ApplicationTestBase::SetUp(); |
CreateSingleViewTreeHost(application_impl(), this, &host_); |
@@ -69,32 +70,35 @@ void ViewManagerTestBase::SetUp() { |
std::swap(window_manager_, most_recent_connection_); |
} |
-void ViewManagerTestBase::TearDown() { |
+void MandolineUIServicesTestBase::TearDown() { |
ApplicationTestBase::TearDown(); |
} |
-ApplicationDelegate* ViewManagerTestBase::GetApplicationDelegate() { |
+mojo::ApplicationDelegate* |
+MandolineUIServicesTestBase::GetApplicationDelegate() { |
return this; |
} |
-bool ViewManagerTestBase::ConfigureIncomingConnection( |
- ApplicationConnection* connection) { |
- connection->AddService<ViewTreeClient>(this); |
+bool MandolineUIServicesTestBase::ConfigureIncomingConnection( |
+ mojo::ApplicationConnection* connection) { |
+ connection->AddService<mojo::ViewTreeClient>(this); |
return true; |
} |
-void ViewManagerTestBase::OnEmbed(View* root) { |
+void MandolineUIServicesTestBase::OnEmbed(View* root) { |
most_recent_connection_ = root->connection(); |
EXPECT_TRUE(QuitRunLoop()); |
} |
-void ViewManagerTestBase::OnConnectionLost(ViewTreeConnection* connection) { |
+void MandolineUIServicesTestBase::OnConnectionLost( |
+ ViewTreeConnection* connection) { |
view_tree_connection_destroyed_ = true; |
} |
-void ViewManagerTestBase::Create(ApplicationConnection* connection, |
- InterfaceRequest<ViewTreeClient> request) { |
+void MandolineUIServicesTestBase::Create( |
+ mojo::ApplicationConnection* connection, |
+ mojo::InterfaceRequest<mojo::ViewTreeClient> request) { |
ViewTreeConnection::Create(this, request.Pass()); |
} |
-} // namespace mojo |
+} // namespace mus |