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

content/renderer/renderer_webkitplatformsupport_impl.cc

 // Copyright (c) 2012 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/renderer_webkitplatformsupport_impl.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/memory/shared_memory.h"
@@ skipping 1062 matching lines @@
 
 // static
 void RendererWebKitPlatformSupportImpl::SetMockDeviceMotionDataForTesting(
     const blink::WebDeviceMotionData& data) {
   g_test_device_motion_data.Get() = data;
 }
 
 // static
 void RendererWebKitPlatformSupportImpl::ResetMockScreenOrientationForTesting()
 {
-  g_test_screen_orientation_controller.Get().ResetData();
+  if (!(g_test_screen_orientation_controller == 0)) {

[mlamouri (slow - plz ping), 2014/05/30 09:07:57]

Why do you need a null check that you didn't need before? Should that be an
ASSERT if this is only preventive?

[ostap, 2014/05/30 15:21:43]

Done.

[ostap, 2014/06/10 18:02:52]

Actually, now Reset is always called on every layout test shutdown. It causes
create of g_test_screen_orientation_controller on shutdown even if it was not
used in test.
The latest patch fixes this problem.

+    g_test_screen_orientation_controller.Get().ResetData();
+    g_test_screen_orientation_controller.Get().ResetRenderView();

[mlamouri (slow - plz ping), 2014/05/30 09:07:57]

Is there a reason why ResetRenderView() should be different from ResetData() is
ResetData() called in other situations than a test runner reset?

[ostap, 2014/05/30 15:21:43]

Done.

+  }
 }
 
 //------------------------------------------------------------------------------
 
 void RendererWebKitPlatformSupportImpl::setDeviceOrientationListener(
     blink::WebDeviceOrientationListener* listener) {
   if (g_test_device_orientation_data == 0) {
     if (!device_orientation_event_pump_) {
       device_orientation_event_pump_.reset(new DeviceOrientationEventPump);
       device_orientation_event_pump_->Attach(RenderThreadImpl::current());
@@ skipping 63 matching lines @@
   if (RenderThreadImpl::current() &&
       RenderThreadImpl::current()->layout_test_mode()) {
     g_test_screen_orientation_controller.Get().ResetLock();
     return;
   }
   RenderThread::Get()->Send(new ScreenOrientationHostMsg_Unlock);
 }
 
 // static
 void RendererWebKitPlatformSupportImpl::SetMockScreenOrientationForTesting(
+    RenderView* render_view,
     blink::WebScreenOrientationType orientation) {
   g_test_screen_orientation_controller.Get()
-      .UpdateDeviceOrientation(orientation);
+      .UpdateDeviceOrientation(render_view, orientation);
 }
 
 //------------------------------------------------------------------------------
 
 void RendererWebKitPlatformSupportImpl::queryStorageUsageAndQuota(
     const blink::WebURL& storage_partition,
     blink::WebStorageQuotaType type,
     blink::WebStorageQuotaCallbacks callbacks) {
   if (!thread_safe_sender_.get() || !quota_message_filter_.get())
     return;
@@ skipping 10 matching lines @@
 void RendererWebKitPlatformSupportImpl::setBatteryStatusListener(
     blink::WebBatteryStatusListener* listener) {
   if (!battery_status_dispatcher_) {
     battery_status_dispatcher_.reset(
         new BatteryStatusDispatcher(RenderThreadImpl::current()));
   }
   battery_status_dispatcher_->SetListener(listener);
 }
 
 }  // namespace content