Retry to add MockPresentationClient to use in layout tests.

content/shell/renderer/test_runner/test_runner.cc

Index: content/shell/renderer/test_runner/test_runner.cc
diff --git a/content/shell/renderer/test_runner/test_runner.cc b/content/shell/renderer/test_runner/test_runner.cc
index 2b79535bcefc506a7094f634a0ebe439c13a6f1f..69644f4d05cc1f123723f976811452282184cc89 100644
--- a/content/shell/renderer/test_runner/test_runner.cc
+++ b/content/shell/renderer/test_runner/test_runner.cc
@@ -204,6 +204,7 @@ class TestRunnerBindings : public gin::Wrappable<TestRunnerBindings> {
                               double dischargingTime,
                               double level);
   void ResetBatteryStatus();
+  void SetMockScreenAvailability(bool available);
   void DidAcquirePointerLock();
   void DidNotAcquirePointerLock();
   void DidLosePointerLock();
@@ -411,6 +412,8 @@ gin::ObjectTemplateBuilder TestRunnerBindings::GetObjectTemplateBuilder(
       .SetMethod("didChangeBatteryStatus",
                  &TestRunnerBindings::DidChangeBatteryStatus)
       .SetMethod("resetBatteryStatus", &TestRunnerBindings::ResetBatteryStatus)
+      .SetMethod("setMockScreenAvailability",
+                 &TestRunnerBindings::SetMockScreenAvailability)
       .SetMethod("didAcquirePointerLock",
                  &TestRunnerBindings::DidAcquirePointerLock)
       .SetMethod("didNotAcquirePointerLock",
@@ -966,6 +969,11 @@ void TestRunnerBindings::ResetBatteryStatus() {
     runner_->ResetBatteryStatus();
 }
 
+void TestRunnerBindings::SetMockScreenAvailability(bool available) {
+  if (runner_)
+    runner_->SetMockScreenAvailability(available);
+}
+
 void TestRunnerBindings::DidAcquirePointerLock() {
   if (runner_)
     runner_->DidAcquirePointerLock();
@@ -1639,6 +1647,7 @@ void TestRunner::Reset() {
     delegate_->ResetScreenOrientation();
     delegate_->SetBluetoothMockDataSet("");
     delegate_->ClearGeofencingMockProvider();
+    delegate_->ResetPresentationService();
     ResetBatteryStatus();
     ResetDeviceLight();
   }
@@ -2459,6 +2468,10 @@ void TestRunner::ResetBatteryStatus() {
   delegate_->DidChangeBatteryStatus(status);
 }
 
+void TestRunner::SetMockScreenAvailability(bool available) {
+  delegate_->SetScreenAvailability(available);
+}
+
 void TestRunner::DidAcquirePointerLock() {
   DidAcquirePointerLockInternal();
 }