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

content/shell/renderer/layout_test/blink_test_runner.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_
 #define CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_
 
 #include <deque>
 #include <vector>
 
@@ skipping 133 matching lines @@
       int request_id,
       const std::vector<std::string>& event_platforms,
       const base::Callback<void(bool)>& callback) override;
   void ResolveBeforeInstallPromptPromise(
       int request_id,
       const std::string& platform) override;
   blink::WebPlugin* CreatePluginPlaceholder(
     blink::WebLocalFrame* frame,
     const blink::WebPluginParams& params) override;
   void OnWebTestProxyBaseDestroy(test_runner::WebTestProxyBase* proxy) override;
+  blink::WebPoint ConvertDIPToNative(
+      const blink::WebPoint& point_in_dip) const override;
 
   void Reset();
 
   void set_proxy(test_runner::WebTestProxyBase* proxy) { proxy_ = proxy; }
   test_runner::WebTestProxyBase* proxy() const { return proxy_; }
 
   void ReportLeakDetectionResult(const LeakDetectionResult& result);
 
  private:
   // Message handlers.
@@ skipping 29 matching lines @@
   std::deque<base::Callback<void(const std::vector<std::string>&)>>
       get_bluetooth_events_callbacks_;
 
   bool is_main_window_;
 
   bool focus_on_next_commit_;
 
   scoped_ptr<LeakDetector> leak_detector_;
   bool needs_leak_detector_;
 
+  float device_scale_factor_;
+
   DISALLOW_COPY_AND_ASSIGN(BlinkTestRunner);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_