Revert of Support device scale factor test with popups in LayoutTest

content/shell/browser/shell.cc

Index: content/shell/browser/shell.cc
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc
index 29e0938dd0b9003dd501019155fff28d0b284b0a..12fde0b981f9818af5e2e58520567335a75aaf31 100644
--- a/content/shell/browser/shell.cc
+++ b/content/shell/browser/shell.cc
@@ -18,7 +18,6 @@
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
-#include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/content_switches.h"
@@ -35,12 +34,6 @@
 #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/test/desktop_screen_x11_test_api.h"
-#endif
 
 namespace content {
 
@@ -390,19 +383,6 @@ 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::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())