Make MockScreenOrientationClient an internal detail of components/test_runner.

components/test_runner/web_test_proxy.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 "components/test_runner/web_test_proxy.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <cctype>
@@ skipping 590 matching lines @@
       new LayoutAndPaintCallback(callback);
   web_widget_->layoutAndPaintAsync(layout_and_paint_callback);
   if (blink::WebPagePopup* popup = web_widget_->pagePopup()) {
     layout_and_paint_callback->set_wait_for_popup(true);
     popup->layoutAndPaintAsync(layout_and_paint_callback);
   }
 }
 
 void WebTestProxyBase::GetScreenOrientationForTesting(
     blink::WebScreenInfo& screen_info) {
-  if (!screen_orientation_client_ || screen_orientation_client_->IsDisabled())
+  MockScreenOrientationClient* mock_client = GetScreenOrientationClientMock();
+  if (mock_client->IsDisabled())

[Łukasz Anforowicz, 2016/03/16 00:16:01]

This is a slightly different condition than before (because now mock_client is
always non-null), but
1) Previously the existance, non-nullness of screen_orientation_client_
   would depend on previous occurence of WebFrameClient (or WebFrameTestProxy)
   webScreenOrientationClient method.  This seems more fragile, than only
   depending on flags directly calls by tests (i.e. tests can disable by
   calling testRunner.disableMockScreenOrientation() from javascript).
2) Tests pass on the trybots.

     return;
   // Override screen orientation information with mock data.
-  screen_info.orientationType =
-      screen_orientation_client_->CurrentOrientationType();
-  screen_info.orientationAngle =
-      screen_orientation_client_->CurrentOrientationAngle();
+  screen_info.orientationType = mock_client->CurrentOrientationType();
+  screen_info.orientationAngle = mock_client->CurrentOrientationAngle();
 }
 
 MockScreenOrientationClient*
 WebTestProxyBase::GetScreenOrientationClientMock() {
-  if (!screen_orientation_client_.get()) {
-    screen_orientation_client_.reset(new MockScreenOrientationClient);
-  }
-  return screen_orientation_client_.get();
+  return test_interfaces_->GetTestRunner()->getMockScreenOrientationClient();
 }
 
 MockWebSpeechRecognizer* WebTestProxyBase::GetSpeechRecognizerMock() {
   if (!speech_recognizer_.get()) {
     speech_recognizer_.reset(new MockWebSpeechRecognizer());
     speech_recognizer_->SetDelegate(delegate_);
   }
   return speech_recognizer_.get();
 }
 
@@ skipping 676 matching lines @@
     callback->onError(blink::WebSetSinkIdError::NotAuthorized);
   else
     callback->onError(blink::WebSetSinkIdError::NotFound);
 }
 
 blink::WebString WebTestProxyBase::acceptLanguages() {
   return blink::WebString::fromUTF8(accept_languages_);
 }
 
 }  // namespace test_runner