Revert of Ensure compositor initialized before WindowTreeHost is Shown.

ui/aura/mus/window_tree_client_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/mus/window_tree_client.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 459 matching lines @@
 };
 
 }  // namespace
 
 TEST_F(WindowTreeClientClientTest, InputEventBasic) {
   InputEventBasicTestWindowDelegate window_delegate(window_tree());
   WindowTreeHostMus window_tree_host(window_tree_client_impl());
   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());
   Window child(&window_delegate);
   child.Init(ui::LAYER_NOT_DRAWN);
   top_level->AddChild(&child);
   child.SetBounds(gfx::Rect(10, 10, 100, 100));
   child.Show();
   EXPECT_FALSE(window_delegate.got_move());
   EXPECT_FALSE(window_delegate.was_acked());
@@ skipping 216 matching lines @@
   child.reset();
   ASSERT_TRUE(window_tree()->AckSingleChangeOfType(
       WindowTreeChangeType::VISIBLE, true));
 }
 
 TEST_F(WindowTreeClientClientTest, NewTopLevelWindow) {
   const size_t initial_root_count =
       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());
   EXPECT_NE(server_id(top_level), server_id(root_window()));
   EXPECT_EQ(initial_root_count + 1,
             window_tree_client_impl()->GetRoots().size());
   EXPECT_TRUE(window_tree_client_impl()->GetRoots().count(top_level) > 0u);
 
   // Ack the request to the windowtree to create the new window.
   uint32_t change_id;
@@ skipping 24 matching lines @@
   const size_t initial_root_count =
       window_tree_client_impl()->GetRoots().size();
   WindowTreeHostMus window_tree_host(window_tree_client_impl());
   Window* top_level = window_tree_host.window();
   EXPECT_EQ(initial_root_count + 1,
             window_tree_client_impl()->GetRoots().size());
 
   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));
 
   ui::mojom::WindowDataPtr data = ui::mojom::WindowData::New();
   data->window_id = server_id(top_level);
   data->bounds.SetRect(1, 2, 3, 4);
   data->visible = true;
   const int64_t display_id = 10;
   uint32_t change_id;
   ASSERT_TRUE(window_tree()->GetAndRemoveFirstChangeOfType(
       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());
 }
 
 TEST_F(WindowTreeClientClientTest, NewWindowGetsAllChangesInFlight) {
   RegisterTestProperties(GetPropertyConverter());
 
   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();
   top_level->Hide();
 
   // Change bounds to 5, 6, 7, 8.
   window_tree_host.SetBoundsInPixels(gfx::Rect(5, 6, 7, 8));
   EXPECT_EQ(gfx::Rect(0, 0, 7, 8), window_tree_host.window()->bounds());
 
   const uint8_t explicitly_set_test_property1_value = 2;
   top_level->SetProperty(kTestPropertyKey1,
@@ skipping 214 matching lines @@
   window_tree()->AckAllChangesOfType(WindowTreeChangeType::REORDER, true);
   EXPECT_EQ(0u, window_tree()->number_of_changes());
 }
 
 TEST_F(WindowTreeClientClientTest,
        TopLevelWindowDestroyedBeforeCreateComplete) {
   const size_t initial_root_count =
       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());
 
   ui::mojom::WindowDataPtr data = ui::mojom::WindowData::New();
   data->window_id = server_id(window_tree_host->window());
 
   // Destroy the window before the server has a chance to ack the window
   // creation.
   window_tree_host.reset();
   EXPECT_EQ(initial_root_count, window_tree_client_impl()->GetRoots().size());
@@ skipping 16 matching lines @@
   properties[kTestPropertyServerKey1] =
       ConvertToPropertyTransportValue(property_value);
   const char kUnknownPropertyKey[] = "unknown-property";
   using UnknownPropertyType = int32_t;
   const UnknownPropertyType kUnknownPropertyValue = 101;
   properties[kUnknownPropertyKey] =
       mojo::ConvertTo<std::vector<uint8_t>>(kUnknownPropertyValue);
   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));
 
   // Get the id of the in flight change for creating the new top level window.
   uint32_t change_id;
   ASSERT_TRUE(window_tree()->GetAndRemoveFirstChangeOfType(
       WindowTreeChangeType::NEW_TOP_LEVEL, &change_id));
 
   // Verify the properties were sent to the server.
@@ skipping 306 matching lines @@
           .CallWmNewDisplayAdded(display, std::move(root_data), parent_drawn);
   EXPECT_EQ(display.bounds(), window_tree_host->GetBoundsInPixels());
   // The root window of the WindowTreeHost always has an origin of 0,0.
   EXPECT_EQ(gfx::Rect(display.bounds().size()),
             window_tree_host->window()->bounds());
   EXPECT_TRUE(window_tree_host->window()->IsVisible());
   EXPECT_EQ(display.id(), window_tree_host->display_id());
 }
 
 }  // namespace aura