Call RenderViewImpl::SetScreenOrientationForTesting to make sure that events are not sent when orie…

content/renderer/screen_orientation/mock_screen_orientation_controller.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/renderer/screen_orientation/mock_screen_orientation_controller.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
+#include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/public/platform/WebScreenOrientationListener.h"
 
 namespace content {
 
 MockScreenOrientationController::MockScreenOrientationController()
     : current_lock_(blink::WebScreenOrientationLockDefault),
       device_orientation_(blink::WebScreenOrientationPortraitPrimary),
       current_orientation_(blink::WebScreenOrientationPortraitPrimary),
-      listener_(NULL) {
+      listener_(NULL),
+      render_view_(NULL) {
   // Since MockScreenOrientationController is held by LazyInstance reference,
   // add this ref for it.
   AddRef();
 }
 
 MockScreenOrientationController::~MockScreenOrientationController() {
 }
 
 void MockScreenOrientationController::SetListener(
     blink::WebScreenOrientationListener* listener) {
   listener_ = listener;
 }
 
 void MockScreenOrientationController::ResetData() {
+  render_view_ = 0;
   current_lock_ = blink::WebScreenOrientationLockDefault;
   device_orientation_ = blink::WebScreenOrientationPortraitPrimary;
   current_orientation_ = blink::WebScreenOrientationPortraitPrimary;
 }
 
 void MockScreenOrientationController::UpdateLock(
     blink::WebScreenOrientationLockType lock) {
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&MockScreenOrientationController::UpdateLockSync, this, lock));
@@ skipping 14 matching lines @@
 
 void MockScreenOrientationController::ResetLockSync() {
   bool will_screen_orientation_need_updating =
       !IsOrientationAllowedByCurrentLock(device_orientation_);
   current_lock_ = blink::WebScreenOrientationLockDefault;
   if (will_screen_orientation_need_updating)
     UpdateScreenOrientation(device_orientation_);
 }
 
 void MockScreenOrientationController::UpdateDeviceOrientation(
+    RenderView* render_view,
     blink::WebScreenOrientationType orientation) {
+  // Make sure that render_view_ did not change during test.
+  assert(!render_view_ || render_view_ == render_view);

[jochen (gone - plz use gerrit), 2014/06/02 07:21:25]

DCHECK

[ostap, 2014/06/03 00:11:54]

Done.

+  render_view_ = render_view;
+
   if (device_orientation_ == orientation)
     return;
   device_orientation_ = orientation;
   if (!IsOrientationAllowedByCurrentLock(orientation))
     return;
   UpdateScreenOrientation(orientation);
 }
 
 void MockScreenOrientationController::UpdateScreenOrientation(
     blink::WebScreenOrientationType orientation) {
   if (current_orientation_ == orientation)
     return;
   current_orientation_ = orientation;
+  if (render_view_)

[jochen (gone - plz use gerrit), 2014/06/02 07:21:25]

nit. add { } because of > 1line body

[ostap, 2014/06/03 00:11:54]

Done.

+    static_cast<RenderViewImpl*>(render_view_)

[jochen (gone - plz use gerrit), 2014/06/02 07:21:25]

how can you guarantee that e.g. the render view didn't die mid-test? was it
possible to use a RenderViewObserver to make sure that the render view is still
alive?

[ostap, 2014/06/03 00:11:54]

At previous patches I did call from ~RenderViewImpl() which was removed by
Mounir request. Completely forgot about RenderViewObserver.

Done.

+        ->SetScreenOrientationForTesting(orientation);
   if (listener_)
     listener_->didChangeScreenOrientation(current_orientation_);
 }
 
 bool MockScreenOrientationController::IsOrientationAllowedByCurrentLock(
     blink::WebScreenOrientationType orientation) {
   if (current_lock_ == blink::WebScreenOrientationLockDefault ||
       current_lock_ == blink::WebScreenOrientationLockAny) {
     return true;
   }
@@ skipping 27 matching lines @@
     case blink::WebScreenOrientationLockLandscape:
       return blink::WebScreenOrientationLandscapePrimary;
     case blink::WebScreenOrientationLockLandscapeSecondary:
       return blink::WebScreenOrientationLandscapePrimary;
     default:
       return blink::WebScreenOrientationPortraitPrimary;
   }
 }
 
 } // namespace content