Revert of Ensure compositor initialized before WindowTreeHost is Shown.

ui/aura/mus/window_tree_client_unittest.cc

Index: ui/aura/mus/window_tree_client_unittest.cc
diff --git a/ui/aura/mus/window_tree_client_unittest.cc b/ui/aura/mus/window_tree_client_unittest.cc
index ef465fc08c91d98ab799902a888b3d9468c0d2a8..4671a454ed1a2a6c8e3a77b83358a70ed1a16449 100644
--- a/ui/aura/mus/window_tree_client_unittest.cc
+++ b/ui/aura/mus/window_tree_client_unittest.cc
@@ -477,7 +477,6 @@
   Window* top_level = window_tree_host.window();
   const gfx::Rect bounds(0, 0, 100, 100);
   window_tree_host.SetBoundsInPixels(bounds);
-  window_tree_host.InitHost();
   window_tree_host.Show();
   EXPECT_EQ(bounds, top_level->bounds());
   EXPECT_EQ(bounds, window_tree_host.GetBoundsInPixels());
@@ -714,7 +713,6 @@
       window_tree_client_impl()->GetRoots().size();
   std::unique_ptr<WindowTreeHostMus> window_tree_host =
       base::MakeUnique<WindowTreeHostMus>(window_tree_client_impl());
-  window_tree_host->InitHost();
   aura::Window* top_level = window_tree_host->window();
   // TODO: need to check WindowTreeHost visibility.
   // EXPECT_TRUE(WindowPrivate(root2).parent_drawn());
@@ -758,10 +756,6 @@
 
   EXPECT_FALSE(IsWindowHostVisible(top_level));
   EXPECT_FALSE(top_level->TargetVisibility());
-
-  // TODO(mfomitchev): crbug.com/672150 InitHost() currently makes the host
-  // visible, which shouldn't be the case.
-  window_tree_host.InitHost();
 
   // Ack the request to the windowtree to create the new window.
   EXPECT_EQ(window_tree()->window_id(), server_id(top_level));
@@ -776,15 +770,13 @@
       WindowTreeChangeType::NEW_TOP_LEVEL, &change_id));
   window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
                                           display_id, true);
-  // TODO(mfomitchev): Uncomment while crbug.com/crbug.com/672150 is fixed
-  //  EXPECT_EQ(
-  //      0u,
-  //      window_tree()->GetChangeCountForType(WindowTreeChangeType::VISIBLE));
+  EXPECT_EQ(
+      0u, window_tree()->GetChangeCountForType(WindowTreeChangeType::VISIBLE));
 
   // Make sure all the properties took.
-  // TODO(mfomitchev): Uncomment while crbug.com/crbug.com/672150 is fixed
-  //  EXPECT_TRUE(IsWindowHostVisible(top_level));
+  EXPECT_TRUE(IsWindowHostVisible(top_level));
   EXPECT_TRUE(top_level->TargetVisibility());
+  // TODO: check display_id.
   EXPECT_EQ(display_id, window_tree_host.display_id());
   EXPECT_EQ(gfx::Rect(0, 0, 3, 4), top_level->bounds());
   EXPECT_EQ(gfx::Rect(1, 2, 3, 4), top_level->GetHost()->GetBoundsInPixels());
@@ -795,9 +787,8 @@
 
   WindowTreeHostMus window_tree_host(window_tree_client_impl());
   Window* top_level = window_tree_host.window();
+
   EXPECT_FALSE(top_level->TargetVisibility());
-
-  window_tree_host.InitHost();
 
   // Make visibility go from false->true->false. Don't ack immediately.
   top_level->Show();
@@ -1033,7 +1024,6 @@
       window_tree_client_impl()->GetRoots().size();
   std::unique_ptr<WindowTreeHostMus> window_tree_host =
       base::MakeUnique<WindowTreeHostMus>(window_tree_client_impl());
-  window_tree_host->InitHost();
   EXPECT_EQ(initial_root_count + 1,
             window_tree_client_impl()->GetRoots().size());
 
@@ -1070,7 +1060,6 @@
   std::unique_ptr<WindowTreeHostMus> window_tree_host =
       base::MakeUnique<WindowTreeHostMus>(window_tree_client_impl(),
                                           &properties);
-  window_tree_host->InitHost();
   // Verify the property made it to the window.
   EXPECT_EQ(property_value,
             window_tree_host->window()->GetProperty(kTestPropertyKey1));