Move to DesktopScreenX11::UpdateDeviceScaleFactor to TestApi

content/shell/browser/shell.cc

 // Copyright 2013 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 "content/shell/browser/shell.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 21 matching lines @@
 #include "content/shell/browser/shell_browser_main_parts.h"
 #include "content/shell/browser/shell_content_browser_client.h"
 #include "content/shell/browser/shell_devtools_frontend.h"
 #include "content/shell/browser/shell_javascript_dialog_manager.h"
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/shell_switches.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/switches.h"
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
-#include "ui/views/widget/desktop_aura/desktop_screen_x11.h"
+#include "ui/views/test/desktop_screen_x11_test_api.h"
 #endif
 
 namespace content {
 
 const int kDefaultTestWindowWidthDip = 800;
 const int kDefaultTestWindowHeightDip = 600;
 
 std::vector<Shell*> Shell::windows_;
 base::Callback<void(Shell*)> Shell::shell_created_callback_;
 
@@ skipping 336 matching lines @@
 bool Shell::HandleContextMenu(const content::ContextMenuParams& params) {
   return PlatformHandleContextMenu(params);
 }
 
 void Shell::SetDeviceScaleFactor(float scale) {
 #if !defined(OS_CHROMEOS)
   gfx::Display::ResetForceDeviceScaleFactorForTesting();
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kForceDeviceScaleFactor, base::StringPrintf("%f", scale));
 #if defined(USE_X11)
-  views::DesktopScreenX11::UpdateDeviceScaleFactorForTest();
+  views::test::DesktopScreenX11TestApi::UpdateDisplays();
 #endif
 #endif
   RenderWidgetHostView* host_view = web_contents_->GetRenderWidgetHostView();
   host_view->SetSize(host_view->GetViewBounds().size());
 }
 
 gfx::Size Shell::GetShellDefaultSize() {
   static gfx::Size default_shell_size;
   if (!default_shell_size.IsEmpty())
     return default_shell_size;
@@ skipping 26 matching lines @@
   devtools_frontend_->Activate();
   devtools_frontend_->Focus();
 }
 
 void Shell::OnDevToolsWebContentsDestroyed() {
   devtools_observer_.reset();
   devtools_frontend_ = NULL;
 }
 
 }  // namespace content