Revert "Revert of Support device scale factor test with popups in LayoutTest (patchset #2 id:40001 …

content/shell/renderer/layout_test/blink_test_runner.cc

Index: content/shell/renderer/layout_test/blink_test_runner.cc
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc
index f7c4285b77c22af72246b67528f58d52ec246683..e292f29bf5944c539ff7b65f16017d729e539282 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -36,6 +36,7 @@
 #include "components/test_runner/web_test_interfaces.h"
 #include "components/test_runner/web_test_proxy.h"
 #include "components/test_runner/web_test_runner.h"
+#include "content/common/content_switches_internal.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/web_preferences.h"
@@ -269,8 +270,8 @@ BlinkTestRunner::BlinkTestRunner(RenderView* render_view)
       focused_view_(NULL),
       is_main_window_(false),
       focus_on_next_commit_(false),
-      leak_detector_(new LeakDetector(this)) {
-}
+      leak_detector_(new LeakDetector(this)),
+      device_scale_factor_(1.f) {}
 
 BlinkTestRunner::~BlinkTestRunner() {
 }
@@ -517,6 +518,10 @@ void BlinkTestRunner::SimulateWebNotificationClick(const std::string& title,
 
 void BlinkTestRunner::SetDeviceScaleFactor(float factor) {
   content::SetDeviceScaleFactor(render_view(), factor);
+  if (device_scale_factor_ == factor)
+    return;
+  device_scale_factor_ = factor;
+  Send(new ShellViewHostMsg_SetDeviceScaleFactor(routing_id(), factor));
 }
 
 void BlinkTestRunner::EnableUseZoomForDSF() {
@@ -769,6 +774,11 @@ void BlinkTestRunner::OnWebTestProxyBaseDestroy(
     test_runner::WebTestProxyBase* proxy) {
 }
 
+blink::WebPoint BlinkTestRunner::ConvertDIPToNative(
+    const blink::WebPoint& point_in_dip) const {
+  return blink::WebPoint(point_in_dip.x * device_scale_factor_,
+                         point_in_dip.y * device_scale_factor_);
+}
 bool BlinkTestRunner::AddMediaStreamVideoSourceAndTrack(
     blink::WebMediaStream* stream) {
   DCHECK(stream);