SetDeviceScaleFactorForTest

ui/wm/test/wm_test_helper.h

Index: ui/wm/test/wm_test_helper.h
diff --git a/ui/wm/test/wm_test_helper.h b/ui/wm/test/wm_test_helper.h
index fbcf85e54432e31976d1ebcfaf0873694ebc1677..a690c94ebd772e942f225d869d535f16096ca2ff 100644
--- a/ui/wm/test/wm_test_helper.h
+++ b/ui/wm/test/wm_test_helper.h
@@ -10,6 +10,7 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/aura/client/window_tree_client.h"
+#include "ui/aura/test/test_screen.h"
 #include "ui/aura/window_tree_host.h"
 
 namespace aura {
@@ -44,7 +45,7 @@ class WMTestHelper : public aura::client::WindowTreeClient {
                ui::ContextFactory* context_factory);
   ~WMTestHelper() override;
 
-  aura::WindowTreeHost* host() { return host_.get(); }
+  aura::WindowTreeHost* host() { return test_screen_->host(); }
 
   // Overridden from client::WindowTreeClient:
   aura::Window* GetDefaultParent(aura::Window* context,
@@ -52,7 +53,7 @@ class WMTestHelper : public aura::client::WindowTreeClient {
                                  const gfx::Rect& bounds) override;
 
  private:
-  std::unique_ptr<aura::WindowTreeHost> host_;
+  std::unique_ptr<aura::TestScreen> test_screen_;
   std::unique_ptr<aura::InputMethodGlue> input_method_glue_;
   std::unique_ptr<wm::CompoundEventFilter> root_window_event_filter_;
   std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_;