SetDeviceScaleFactorForTest

content/shell/browser/shell_views.cc

Index: content/shell/browser/shell_views.cc
diff --git a/content/shell/browser/shell_views.cc b/content/shell/browser/shell_views.cc
index 1306c5ce903bddaa26c835993b4d40a3b4f9905a..4f0f81706b9e40e6278a8f298890e191362cfd44 100644
--- a/content/shell/browser/shell_views.cc
+++ b/content/shell/browser/shell_views.cc
@@ -34,7 +34,6 @@
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_CHROMEOS)
-#include "ui/aura/test/test_screen.h"
 #include "ui/wm/test/wm_test_helper.h"
 #else  // !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
@@ -310,10 +309,9 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
 }  // namespace
 
 #if defined(OS_CHROMEOS)
-wm::WMTestHelper* Shell::wm_test_helper_ = NULL;
-display::Screen* Shell::test_screen_ = NULL;
+wm::WMTestHelper* wm_test_helper_ = NULL;
 #endif
-views::ViewsDelegate* Shell::views_delegate_ = NULL;
+views::ViewsDelegate* views_delegate_ = NULL;
 
 // static
 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
@@ -322,8 +320,6 @@ void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
   _setmode(_fileno(stderr), _O_BINARY);
 #endif
 #if defined(OS_CHROMEOS)
-  test_screen_ = aura::TestScreen::Create(gfx::Size());
-  display::Screen::SetScreenInstance(test_screen_);
   wm_test_helper_ = new wm::WMTestHelper(default_window_size,
                                          GetContextFactory());
 #else
@@ -336,9 +332,6 @@ void Shell::PlatformExit() {
 #if defined(OS_CHROMEOS)
   delete wm_test_helper_;
   wm_test_helper_ = NULL;
-
-  delete test_screen_;
-  test_screen_ = NULL;
 #endif
   delete views_delegate_;
   views_delegate_ = NULL;
@@ -386,20 +379,16 @@ void Shell::PlatformCreateWindow(int width, int height) {
       platform_->ResizeWindow(content_size_);
     return;
   }
-#if defined(OS_CHROMEOS)
-  window_widget_ = views::Widget::CreateWindowWithContextAndBounds(
-      new ShellWindowDelegateView(this),
-      wm_test_helper_->GetDefaultParent(NULL, NULL, gfx::Rect()),
-      gfx::Rect(0, 0, width, height));
-#else
   window_widget_ = new views::Widget;
   views::Widget::InitParams params;
   params.bounds = gfx::Rect(0, 0, width, height);
   params.delegate = new ShellWindowDelegateView(this);
   params.wm_class_class = "chromium-content_shell";
   params.wm_class_name = params.wm_class_class;
-  window_widget_->Init(params);
+#if defined(OS_CHROMEOS)
+  params.context = wm_test_helper_->host()->window();
 #endif
+  window_widget_->Init(params);
 
   content_size_ = gfx::Size(width, height);