Fix ws::Display initialization order.

services/ui/ws/test_utils.h

 // 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.
 
 #ifndef SERVICES_UI_WS_TEST_UTILS_H_
 #define SERVICES_UI_WS_TEST_UTILS_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 230 matching lines @@
 
 // Factory that dispenses TestPlatformDisplays.
 class TestPlatformDisplayFactory : public PlatformDisplayFactory {
  public:
   static const int64_t kFirstDisplayId;
 
   explicit TestPlatformDisplayFactory(mojom::Cursor* cursor_storage);
   ~TestPlatformDisplayFactory();
 
   // PlatformDisplayFactory:
-  PlatformDisplay* CreatePlatformDisplay() override;
+  std::unique_ptr<PlatformDisplay> CreatePlatformDisplay() override;
 
  private:
   mojom::Cursor* cursor_storage_;
   int64_t next_display_id_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplayFactory);
 };
 
 // -----------------------------------------------------------------------------
 
@@ skipping 341 matching lines @@
   TestWindowTreeClient* last_window_tree_client() {
     return ws_test_helper_.window_server_delegate()->last_client();
   }
   TestWindowTreeClient* wm_client() { return wm_client_; }
   WindowServer* window_server() { return ws_test_helper_.window_server(); }
 
  private:
   WindowServerTestHelper ws_test_helper_;
   // TestWindowTreeClient that is used for the WM client. Owned by
   // |window_server_delegate_|
-  TestWindowTreeClient* wm_client_;
+  TestWindowTreeClient* wm_client_ = nullptr;
   // Owned by WindowServer
-  TestDisplayBinding* display_binding_;
+  TestDisplayBinding* display_binding_ = nullptr;
   // Owned by WindowServer's DisplayManager.
-  Display* display_;
+  Display* display_ = nullptr;
   scoped_refptr<DisplayCompositor> display_compositor_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowEventTargetingHelper);
 };
 
 // -----------------------------------------------------------------------------
 
 // Adds a new WM to |window_server| for |user_id|. Creates
 // WindowManagerWindowTreeFactory and associated WindowTree for the WM.
 void AddWindowManager(WindowServer* window_server, const UserId& user_id);
@@ skipping 15 matching lines @@
 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id);
 ServerWindow* NewWindowInTreeWithParent(WindowTree* tree,
                                         ServerWindow* parent,
                                         ClientWindowId* client_id);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_UTILS_H_