SetDeviceScaleFactorForTest

ui/wm/test/wm_test_helper.cc

Index: ui/wm/test/wm_test_helper.cc
diff --git a/ui/wm/test/wm_test_helper.cc b/ui/wm/test/wm_test_helper.cc
index 2f75a49ceabe1bb52b82baf65030769c067a63f7..2597aef1b9f4d5cbf8a26adef212acda62b4f8ff 100644
--- a/ui/wm/test/wm_test_helper.cc
+++ b/ui/wm/test/wm_test_helper.cc
@@ -17,21 +17,23 @@ namespace wm {
 WMTestHelper::WMTestHelper(const gfx::Size& default_window_size,
                            ui::ContextFactory* context_factory) {
   aura::Env::GetInstance()->set_context_factory(context_factory);
-  host_.reset(aura::WindowTreeHost::Create(gfx::Rect(default_window_size)));
-  host_->InitHost();
-  input_method_glue_.reset(new aura::InputMethodGlue(host_.get()));
-  aura::client::SetWindowTreeClient(host_->window(), this);
+
+  test_screen_.reset(aura::TestScreen::Create(default_window_size));
+  display::Screen::SetScreenInstance(test_screen_.get());
+  test_screen_->CreateHostForPrimaryDisplay();
+  input_method_glue_.reset(new aura::InputMethodGlue(host()));
+  aura::client::SetWindowTreeClient(host()->window(), this);
 
   focus_client_.reset(new aura::test::TestFocusClient);
-  aura::client::SetFocusClient(host_->window(), focus_client_.get());
+  aura::client::SetFocusClient(host()->window(), focus_client_.get());
 
   root_window_event_filter_.reset(new wm::CompoundEventFilter);
-  host_->window()->AddPreTargetHandler(root_window_event_filter_.get());
+  host()->window()->AddPreTargetHandler(root_window_event_filter_.get());
 
-  new wm::DefaultActivationClient(host_->window());
+  new wm::DefaultActivationClient(host()->window());
 
   capture_client_.reset(
-      new aura::client::DefaultCaptureClient(host_->window()));
+      new aura::client::DefaultCaptureClient(host()->window()));
 }
 
 WMTestHelper::~WMTestHelper() {
@@ -40,7 +42,7 @@ WMTestHelper::~WMTestHelper() {
 aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context,
                                              aura::Window* window,
                                              const gfx::Rect& bounds) {
-  return host_->window();
+  return host()->window();
 }
 
 }  // namespace wm