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

content/shell/browser/blink_test_controller.h

 // 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.
 
 #ifndef CONTENT_SHELL_BROWSER_BLINK_TEST_CONTROLLER_H_
 #define CONTENT_SHELL_BROWSER_BLINK_TEST_CONTROLLER_H_
 
 #include <ostream>
 #include <string>
 
@@ skipping 170 matching lines @@
   void OnReload();
   void OnLoadURLForFrame(const GURL& url, const std::string& frame_name);
   void OnCaptureSessionHistory();
   void OnCloseRemainingWindows();
   void OnResetDone();
   void OnLeakDetectionDone(const content::LeakDetectionResult& result);
   void OnSetBluetoothManualChooser(bool enable);
   void OnGetBluetoothManualChooserEvents();
   void OnSendBluetoothManualChooserEvent(const std::string& event,
                                          const std::string& argument);
+  void OnSetDeviceScaleFactor(float scale);
 
   scoped_ptr<BlinkTestResultPrinter> printer_;
 
   base::FilePath current_working_directory_;
   base::FilePath temp_path_;
 
   Shell* main_window_;
 
   // The PID of the render process of the render view host of main_window_.
   int current_pid_;
@@ skipping 33 matching lines @@
   // waiting on the UI thread while layout tests are being ran.
   ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BlinkTestController);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_BROWSER_BLINK_TEST_CONTROLLER_H_