| Index: services/ui/ws/test_utils.h
|
| diff --git a/services/ui/ws/test_utils.h b/services/ui/ws/test_utils.h
|
| index 43c4842bb1dc2c8ccce2e8887a835e9d820105c7..eac32c38899406369b1a87894519f55ad1cb71eb 100644
|
| --- a/services/ui/ws/test_utils.h
|
| +++ b/services/ui/ws/test_utils.h
|
| @@ -248,7 +248,7 @@ class TestPlatformDisplayFactory : public PlatformDisplayFactory {
|
| ~TestPlatformDisplayFactory();
|
|
|
| // PlatformDisplayFactory:
|
| - PlatformDisplay* CreatePlatformDisplay() override;
|
| + std::unique_ptr<PlatformDisplay> CreatePlatformDisplay() override;
|
|
|
| private:
|
| mojom::Cursor* cursor_storage_;
|
| @@ -609,11 +609,11 @@ class WindowEventTargetingHelper {
|
| 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);
|
|
|