Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1148)

Unified Diff: services/ui/ws/test_utils.h

Issue 2497303002: Fix ws::Display initialization order. (Closed)
Patch Set: Fix use after move in test. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/ui/ws/platform_display_factory.h ('k') | services/ui/ws/test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/test_utils.h
diff --git a/services/ui/ws/test_utils.h b/services/ui/ws/test_utils.h
index 327a1116037ec0e1599eb0d3a18139de50039edc..20a524c821ddd0e7f90ac68530daaa57f7d2acb0 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_;
@@ -610,11 +610,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);
« no previous file with comments | « services/ui/ws/platform_display_factory.h ('k') | services/ui/ws/test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698