SetDeviceScaleFactorForTest

ui/views_content_client/views_content_client_main_parts_chromeos.cc

Index: ui/views_content_client/views_content_client_main_parts_chromeos.cc
diff --git a/ui/views_content_client/views_content_client_main_parts_chromeos.cc b/ui/views_content_client/views_content_client_main_parts_chromeos.cc
index 9ee0e6909e1eef45be36e827b3b989df2398ab4c..4f3d56dfb7f46b57b8043dffb9ef7aa3cb44ad34 100644
--- a/ui/views_content_client/views_content_client_main_parts_chromeos.cc
+++ b/ui/views_content_client/views_content_client_main_parts_chromeos.cc
@@ -5,7 +5,6 @@
 #include "base/macros.h"
 #include "content/public/browser/context_factory.h"
 #include "content/shell/browser/shell_browser_context.h"
-#include "ui/aura/test/test_screen.h"
 #include "ui/aura/window.h"
 #include "ui/display/screen.h"
 #include "ui/views_content_client/views_content_client.h"
@@ -30,7 +29,6 @@ class ViewsContentClientMainPartsChromeOS
 
  private:
   // Enable a minimal set of views::corewm to be initialized.
-  std::unique_ptr<display::Screen> test_screen_;
   std::unique_ptr<::wm::WMTestHelper> wm_test_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsChromeOS);
@@ -46,8 +44,6 @@ void ViewsContentClientMainPartsChromeOS::PreMainMessageLoopRun() {
   ViewsContentClientMainPartsAura::PreMainMessageLoopRun();
 
   gfx::Size host_size(800, 600);
-  test_screen_.reset(aura::TestScreen::Create(host_size));
-  display::Screen::SetScreenInstance(test_screen_.get());
   // Set up basic pieces of views::corewm.
   wm_test_helper_.reset(
       new ::wm::WMTestHelper(host_size, content::GetContextFactory()));
@@ -61,7 +57,6 @@ void ViewsContentClientMainPartsChromeOS::PreMainMessageLoopRun() {
 
 void ViewsContentClientMainPartsChromeOS::PostMainMessageLoopRun() {
   wm_test_helper_.reset();
-  test_screen_.reset();
 
   ViewsContentClientMainPartsAura::PostMainMessageLoopRun();
 }