Fix ws::Display initialization order.

services/ui/ws/test_utils.cc

 // Copyright 2016 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 "services/ui/ws/test_utils.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 22 matching lines @@
                                mojom::Cursor* cursor_storage)
       : id_(id),
         is_primary_(is_primary),
         cursor_storage_(cursor_storage) {
     display_metrics_.bounds = gfx::Rect(0, 0, 400, 300);
     display_metrics_.device_scale_factor = 1.f;
   }
   ~TestPlatformDisplay() override {}
 
   // PlatformDisplay:
-  void Init(PlatformDisplayDelegate* delegate) override {}
+  void Init(PlatformDisplayDelegate* delegate) override {
+    delegate->OnAcceleratedWidgetAvailable();
+  }
   int64_t GetId() const override { return id_; }
   void SetViewportSize(const gfx::Size& size) override {}
   void SetTitle(const base::string16& title) override {}
   void SetCapture() override {}
   void ReleaseCapture() override {}
   void SetCursorById(mojom::Cursor cursor) override {
     *cursor_storage_ = cursor;
   }
   void UpdateTextInputState(const ui::TextInputState& state) override {}
   void SetImeVisibility(bool visible) override {}
@@ skipping 38 matching lines @@
 
 const int64_t TestPlatformDisplayFactory::kFirstDisplayId = 1;
 
 TestPlatformDisplayFactory::TestPlatformDisplayFactory(
     mojom::Cursor* cursor_storage)
     : cursor_storage_(cursor_storage),
       next_display_id_(kFirstDisplayId) {}
 
 TestPlatformDisplayFactory::~TestPlatformDisplayFactory() {}
 
-PlatformDisplay* TestPlatformDisplayFactory::CreatePlatformDisplay() {
+std::unique_ptr<PlatformDisplay>
+TestPlatformDisplayFactory::CreatePlatformDisplay() {
   bool is_primary = (next_display_id_ == kFirstDisplayId);
-  return new TestPlatformDisplay(next_display_id_++, is_primary,
-                                 cursor_storage_);
+  return base::MakeUnique<TestPlatformDisplay>(next_display_id_++, is_primary,
+                                               cursor_storage_);
 }
 
 // TestFrameGeneratorDelegate -------------------------------------------------
 
 TestFrameGeneratorDelegate::TestFrameGeneratorDelegate() {}
 
 TestFrameGeneratorDelegate::~TestFrameGeneratorDelegate() {}
 
 bool TestFrameGeneratorDelegate::IsInHighContrastMode() {
   return false;
@@ skipping 289 matching lines @@
 void TestWindowServerDelegate::CreateDisplays(int num_displays) {
   DCHECK_GT(num_displays, 0);
   DCHECK(window_server_);
 
   for (int i = 0; i < num_displays; ++i)
     AddDisplay();
 }
 
 Display* TestWindowServerDelegate::AddDisplay() {
   // Display manages its own lifetime.
-  Display* display = new Display(window_server_, PlatformDisplayInitParams());
-  display->Init(nullptr);
+  Display* display = new Display(window_server_);
+  display->Init(PlatformDisplayInitParams(), nullptr);
   return display;
 }
 
 void TestWindowServerDelegate::StartDisplayInit() {}
 
 void TestWindowServerDelegate::OnNoMoreDisplays() {
   got_on_no_more_displays_ = true;
 }
 
 std::unique_ptr<WindowTreeBinding>
@@ skipping 23 matching lines @@
   window_server_delegate_.set_window_server(window_server_.get());
 }
 
 WindowServerTestHelper::~WindowServerTestHelper() {
   // Destroy |window_server_| while the message-loop is still alive.
   window_server_.reset();
 }
 
 // WindowEventTargetingHelper ------------------------------------------------
 
-WindowEventTargetingHelper::WindowEventTargetingHelper()
-    : wm_client_(nullptr), display_binding_(nullptr), display_(nullptr) {
-  PlatformDisplayInitParams display_init_params;
-  display_ = new Display(window_server(), display_init_params);
+WindowEventTargetingHelper::WindowEventTargetingHelper() {
+  display_ = new Display(window_server());
   display_binding_ = new TestDisplayBinding(window_server());
-  display_->Init(base::WrapUnique(display_binding_));
+  display_->Init(PlatformDisplayInitParams(),
+                 base::WrapUnique(display_binding_));
   wm_client_ = ws_test_helper_.window_server_delegate()->last_client();
   wm_client_->tracker()->changes()->clear();
 }
 
 WindowEventTargetingHelper::~WindowEventTargetingHelper() {}
 
 ServerWindow* WindowEventTargetingHelper::CreatePrimaryTree(
     const gfx::Rect& root_window_bounds,
     const gfx::Rect& window_bounds) {
   WindowTree* wm_tree = window_server()->GetTreeWithId(1);
@@ skipping 102 matching lines @@
     return nullptr;
   if (!tree->AddWindow(parent_client_id, client_window_id))
     return nullptr;
   *client_id = client_window_id;
   return tree->GetWindowByClientId(client_window_id);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui