Index: components/mus/view_manager_client_apptest.cc |
diff --git a/components/view_manager/view_manager_client_apptest.cc b/components/mus/view_manager_client_apptest.cc |
similarity index 98% |
rename from components/view_manager/view_manager_client_apptest.cc |
rename to components/mus/view_manager_client_apptest.cc |
index 7c5dec8a01597466935e11f17cf2b1d11d73bdbb..8bb453193ae8d9a99b098e15cabe90a072993870 100644 |
--- a/components/view_manager/view_manager_client_apptest.cc |
+++ b/components/mus/view_manager_client_apptest.cc |
@@ -5,11 +5,11 @@ |
#include "base/bind.h" |
#include "base/logging.h" |
#include "base/run_loop.h" |
-#include "components/view_manager/public/cpp/tests/view_manager_test_base.h" |
-#include "components/view_manager/public/cpp/util.h" |
-#include "components/view_manager/public/cpp/view_observer.h" |
-#include "components/view_manager/public/cpp/view_tree_connection.h" |
-#include "components/view_manager/public/cpp/view_tree_delegate.h" |
+#include "components/mus/public/cpp/tests/view_manager_test_base.h" |
+#include "components/mus/public/cpp/util.h" |
+#include "components/mus/public/cpp/view_observer.h" |
+#include "components/mus/public/cpp/view_tree_connection.h" |
+#include "components/mus/public/cpp/view_tree_delegate.h" |
#include "mojo/application/public/cpp/application_connection.h" |
#include "mojo/application/public/cpp/application_impl.h" |
#include "mojo/application/public/cpp/application_test_base.h" |
@@ -402,8 +402,8 @@ TEST_F(ViewManagerTest, DISABLED_Reorder) { |
{ |
view11->MoveToBack(); |
- ASSERT_TRUE(WaitForOrderChange(embedded, |
- embedded->GetViewById(view11->id()))); |
+ ASSERT_TRUE( |
+ WaitForOrderChange(embedded, embedded->GetViewById(view11->id()))); |
EXPECT_EQ(root_in_embedded->children().front(), |
embedded->GetViewById(view11->id())); |
@@ -651,8 +651,7 @@ TEST_F(ViewManagerTest, DeleteViewManager) { |
ViewTreeConnection* connection = Embed(view).connection; |
ASSERT_TRUE(connection); |
bool got_destroy = false; |
- DestroyedChangedObserver observer(this, connection->GetRoot(), |
- &got_destroy); |
+ DestroyedChangedObserver observer(this, connection->GetRoot(), &got_destroy); |
delete connection; |
EXPECT_TRUE(view_tree_connection_destroyed()); |
EXPECT_TRUE(got_destroy); |