Scale client area, hit test mask and bounds by device_scale_factor.

services/ui/public/cpp/tests/window_server_test_base.cc

 // Copyright 2015 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.
 
 #include "services/ui/public/cpp/tests/window_server_test_base.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 17 matching lines @@
 }
 
 }  // namespace
 
 WindowServerTestBase::WindowServerTestBase()
     : window_manager_(nullptr),
       window_manager_delegate_(nullptr),
       window_manager_client_(nullptr) {}
 
 WindowServerTestBase::~WindowServerTestBase() {
+  display::Screen::SetScreenInstance(nullptr);
   window_tree_clients_.clear();
 }
 
 // static
 bool WindowServerTestBase::DoRunLoopWithTimeout() {
   if (current_run_loop != nullptr)
     return false;
 
   bool timeout = false;
   base::RunLoop run_loop;
@@ skipping 25 matching lines @@
       window_tree_clients_.erase(iter);
       return;
     }
   }
   NOTREACHED();
 }
 
 void WindowServerTestBase::SetUp() {
   WindowServerServiceTestBase::SetUp();
 
+  display::Screen::SetScreenInstance(&test_screen_);
   std::unique_ptr<WindowTreeClient> window_manager_window_tree_client =
       base::MakeUnique<WindowTreeClient>(this, this);
   window_manager_window_tree_client->ConnectAsWindowManager(connector());
   window_manager_ = window_manager_window_tree_client.get();
   window_tree_clients_.insert(std::move(window_manager_window_tree_client));
 
   ASSERT_TRUE(DoRunLoopWithTimeout());  // RunLoop should be quit by OnEmbed().
 }
 
 bool WindowServerTestBase::OnConnect(
@@ skipping 97 matching lines @@
 }
 
 void WindowServerTestBase::Create(
     const service_manager::Identity& remote_identity,
     mojom::WindowTreeClientRequest request) {
   window_tree_clients_.insert(
       base::MakeUnique<WindowTreeClient>(this, nullptr, std::move(request)));
 }
 
 }  // namespace ui