Make MockScreenOrientationClient an internal detail of components/test_runner.

components/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 "components/test_runner/test_runner.h"
 
 #include <stddef.h>
 #include <limits>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "components/test_runner/app_banner_client.h"
 #include "components/test_runner/mock_credential_manager_client.h"
+#include "components/test_runner/mock_screen_orientation_client.h"
 #include "components/test_runner/mock_web_speech_recognizer.h"
 #include "components/test_runner/test_interfaces.h"
 #include "components/test_runner/test_preferences.h"
 #include "components/test_runner/web_content_settings.h"
 #include "components/test_runner/web_test_delegate.h"
 #include "components/test_runner/web_test_proxy.h"
 #include "gin/arguments.h"
 #include "gin/array_buffer.h"
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"
@@ skipping 1627 matching lines @@
 TestRunner::TestRunner(TestInterfaces* interfaces)
     : test_is_running_(false),
       close_remaining_windows_(false),
       work_queue_(this),
       web_history_item_count_(0),
       intercept_post_message_(false),
       test_interfaces_(interfaces),
       delegate_(nullptr),
       web_view_(nullptr),
       web_content_settings_(new WebContentSettings()),
+      mock_screen_orientation_client_(new MockScreenOrientationClient),
       weak_factory_(this) {}
 
 TestRunner::~TestRunner() {}
 
 void TestRunner::Install(WebFrame* frame) {
   TestRunnerBindings::Install(weak_factory_.GetWeakPtr(), frame);
 }
 
 void TestRunner::SetDelegate(WebTestDelegate* delegate) {
   delegate_ = delegate;
@@ skipping 17 matching lines @@
         0xff1e90ff, 0xff000000, 0xffc8c8c8, 0xff323232);
 #endif
     web_view_->setVisibilityState(WebPageVisibilityStateVisible, true);
     web_view_->mainFrame()->enableViewSourceMode(false);
 
     web_view_->setPageOverlayColor(SK_ColorTRANSPARENT);
   }
 
   top_loading_frame_ = nullptr;
   layout_dump_flags_.Reset();
+  mock_screen_orientation_client_->ResetData();

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

This just copies method body from the deleted
BlinkTestRunner::ResetScreenOrientation method.

   wait_until_external_url_load_ = false;
   policy_delegate_enabled_ = false;
   policy_delegate_is_permissive_ = false;
   policy_delegate_should_notify_done_ = false;
 
   WebSecurityPolicy::resetOriginAccessWhitelists();
 #if defined(__linux__) || defined(ANDROID)
   WebFontRendering::setSubpixelPositioning(false);
 #endif
 
   if (delegate_) {
     // Reset the default quota for each origin to 5MB
     delegate_->SetDatabaseQuota(5 * 1024 * 1024);
     delegate_->SetDeviceColorProfile("reset");
     delegate_->SetDeviceScaleFactor(GetDefaultDeviceScaleFactor());
     delegate_->SetAcceptAllCookies(false);
     delegate_->SetLocale("");
     delegate_->UseUnfortunateSynchronousResizeMode(false);
     delegate_->DisableAutoResizeMode(WebSize());
     delegate_->DeleteAllCookies();
-    delegate_->ResetScreenOrientation();
     delegate_->SetBluetoothMockDataSet("");
     delegate_->ClearGeofencingMockProvider();
     delegate_->ResetPermissions();
     ResetDeviceLight();
   }
 
   dump_editting_callbacks_ = false;
   dump_icon_changes_ = false;
   dump_as_audio_ = false;
   dump_frame_load_callbacks_ = false;
@@ skipping 759 matching lines @@
   // gamma
   orientation.hasGamma = has_gamma;
   orientation.gamma = gamma;
 
   // absolute
   orientation.absolute = absolute;
 
   delegate_->SetDeviceOrientationData(orientation);
 }
 
+MockScreenOrientationClient* TestRunner::getMockScreenOrientationClient() {
+  return mock_screen_orientation_client_.get();
+}
+
 void TestRunner::SetMockScreenOrientation(const std::string& orientation_str) {
   blink::WebScreenOrientationType orientation;
 
   if (orientation_str == "portrait-primary") {
     orientation = WebScreenOrientationPortraitPrimary;
   } else if (orientation_str == "portrait-secondary") {
     orientation = WebScreenOrientationPortraitSecondary;
   } else if (orientation_str == "landscape-primary") {
     orientation = WebScreenOrientationLandscapePrimary;
-  } else if (orientation_str == "landscape-secondary") {
+  } else {
+    DCHECK_EQ("landscape-secondary", orientation_str);

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

Otherwise |orientation| might not be initialized at all.

     orientation = WebScreenOrientationLandscapeSecondary;
   }
 
-  delegate_->SetScreenOrientation(orientation);
+  // TODO(lukasza): This is broken for OOPIFs.
+  WebLocalFrame* main_frame = web_view_->mainFrame()->toWebLocalFrame();
+  mock_screen_orientation_client_->UpdateDeviceOrientation(
+      main_frame, orientation);

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

This just copies method body from the deleted
BlinkTestRunner::SetScreenOrientation method (and adds a TODO).

 }
 
 void TestRunner::DisableMockScreenOrientation() {
-  delegate_->DisableMockScreenOrientation();
+  mock_screen_orientation_client_->SetDisabled(true);

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

This just copies method body from the deleted
BlinkTestRunner::DisableMockScreenOrientation method.

 }
 
 void TestRunner::DidAcquirePointerLock() {
   DidAcquirePointerLockInternal();
 }
 
 void TestRunner::DidNotAcquirePointerLock() {
   DidNotAcquirePointerLockInternal();
 }
 
@@ skipping 672 matching lines @@
 }
 
 void TestRunner::DidLosePointerLockInternal() {
   bool was_locked = pointer_locked_;
   pointer_locked_ = false;
   if (was_locked)
     web_view_->didLosePointerLock();
 }
 
 }  // namespace test_runner