Revert of Retry to add MockPresentationClient to use in layout tests.

content/shell/renderer/test_runner/test_runner.cc

 // Copyright 2014 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/renderer/test_runner/test_runner.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "content/public/test/layouttest_support.h"
@@ skipping 186 matching lines @@
   void SetMockDeviceLight(double value);
   void ResetDeviceLight();
   void SetMockDeviceMotion(gin::Arguments* args);
   void SetMockDeviceOrientation(gin::Arguments* args);
   void SetMockScreenOrientation(const std::string& orientation);
   void DidChangeBatteryStatus(bool charging,
                               double chargingTime,
                               double dischargingTime,
                               double level);
   void ResetBatteryStatus();
-  void SetMockScreenAvailability(bool available);
   void DidAcquirePointerLock();
   void DidNotAcquirePointerLock();
   void DidLosePointerLock();
   void SetPointerLockWillFailSynchronously();
   void SetPointerLockWillRespondAsynchronously();
   void SetPopupBlockingEnabled(bool block_popups);
   void SetJavaScriptCanAccessClipboard(bool can_access);
   void SetXSSAuditorEnabled(bool enabled);
   void SetAllowUniversalAccessFromFileURLs(bool allow);
   void SetAllowFileAccessFromFileURLs(bool allow);
@@ skipping 187 matching lines @@
       .SetMethod("resetDeviceLight", &TestRunnerBindings::ResetDeviceLight)
       .SetMethod("setMockDeviceMotion",
                  &TestRunnerBindings::SetMockDeviceMotion)
       .SetMethod("setMockDeviceOrientation",
                  &TestRunnerBindings::SetMockDeviceOrientation)
       .SetMethod("setMockScreenOrientation",
                  &TestRunnerBindings::SetMockScreenOrientation)
       .SetMethod("didChangeBatteryStatus",
                  &TestRunnerBindings::DidChangeBatteryStatus)
       .SetMethod("resetBatteryStatus", &TestRunnerBindings::ResetBatteryStatus)
-      .SetMethod("setMockScreenAvailability",
-                 &TestRunnerBindings::SetMockScreenAvailability)
       .SetMethod("didAcquirePointerLock",
                  &TestRunnerBindings::DidAcquirePointerLock)
       .SetMethod("didNotAcquirePointerLock",
                  &TestRunnerBindings::DidNotAcquirePointerLock)
       .SetMethod("didLosePointerLock", &TestRunnerBindings::DidLosePointerLock)
       .SetMethod("setPointerLockWillFailSynchronously",
                  &TestRunnerBindings::SetPointerLockWillFailSynchronously)
       .SetMethod("setPointerLockWillRespondAsynchronously",
                  &TestRunnerBindings::SetPointerLockWillRespondAsynchronously)
       .SetMethod("setPopupBlockingEnabled",
@@ skipping 535 matching lines @@
     runner_->DidChangeBatteryStatus(charging, chargingTime,
                                     dischargingTime, level);
   }
 }
 
 void TestRunnerBindings::ResetBatteryStatus() {
   if (runner_)
     runner_->ResetBatteryStatus();
 }
 
-void TestRunnerBindings::SetMockScreenAvailability(bool available) {
-  if (runner_)
-    runner_->SetMockScreenAvailability(available);
-}
-
 void TestRunnerBindings::DidAcquirePointerLock() {
   if (runner_)
     runner_->DidAcquirePointerLock();
 }
 
 void TestRunnerBindings::DidNotAcquirePointerLock() {
   if (runner_)
     runner_->DidNotAcquirePointerLock();
 }
 
@@ skipping 653 matching lines @@
     delegate_->SetDeviceColorProfile("reset");
     delegate_->SetDeviceScaleFactor(1);
     delegate_->SetAcceptAllCookies(false);
     delegate_->SetLocale("");
     delegate_->UseUnfortunateSynchronousResizeMode(false);
     delegate_->DisableAutoResizeMode(WebSize());
     delegate_->DeleteAllCookies();
     delegate_->ResetScreenOrientation();
     delegate_->SetBluetoothMockDataSet("");
     delegate_->ClearGeofencingMockProvider();
-    delegate_->ResetPresentationService();
     ResetBatteryStatus();
     ResetDeviceLight();
   }
 
   dump_editting_callbacks_ = false;
   dump_as_text_ = false;
   dump_as_markup_ = false;
   generate_pixel_results_ = true;
   dump_child_frame_scroll_positions_ = false;
   dump_child_frames_as_markup_ = false;
@@ skipping 800 matching lines @@
   status.dischargingTime = dischargingTime;
   status.level = level;
   delegate_->DidChangeBatteryStatus(status);
 }
 
 void TestRunner::ResetBatteryStatus() {
   blink::WebBatteryStatus status;
   delegate_->DidChangeBatteryStatus(status);
 }
 
-void TestRunner::SetMockScreenAvailability(bool available) {
-  delegate_->SetScreenAvailability(available);
-}
-
 void TestRunner::DidAcquirePointerLock() {
   DidAcquirePointerLockInternal();
 }
 
 void TestRunner::DidNotAcquirePointerLock() {
   DidNotAcquirePointerLockInternal();
 }
 
 void TestRunner::DidLosePointerLock() {
   DidLosePointerLockInternal();
@@ skipping 549 matching lines @@
 }
 
 void TestRunner::DidLosePointerLockInternal() {
   bool was_locked = pointer_locked_;
   pointer_locked_ = false;
   if (was_locked)
     web_view_->didLosePointerLock();
 }
 
 }  // namespace content