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

content/renderer/render_view_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/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 84 matching lines @@
 #include "content/renderer/mhtml_generator.h"
 #include "content/renderer/push_messaging_dispatcher.h"
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_frame_proxy.h"
 #include "content/renderer/render_process.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl_params.h"
 #include "content/renderer/render_view_mouse_lock_dispatcher.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
+#include "content/renderer/renderer_webkitplatformsupport_impl.h"
 #include "content/renderer/resizing_mode_selector.h"
 #include "content/renderer/savable_resources.h"
 #include "content/renderer/skia_benchmarking_extension.h"
 #include "content/renderer/speech_recognition_dispatcher.h"
 #include "content/renderer/stats_collection_controller.h"
 #include "content/renderer/stats_collection_observer.h"
 #include "content/renderer/text_input_client_observer.h"
 #include "content/renderer/v8_value_converter_impl.h"
 #include "content/renderer/web_ui_extension.h"
 #include "content/renderer/web_ui_extension_data.h"
@@ skipping 709 matching lines @@
       webview()->mainFrame()->setOpener(opener_view->webview()->mainFrame());
   }
 
   // If we are initially swapped out, navigate to kSwappedOutURL.
   // This ensures we are in a unique origin that others cannot script.
   if (is_swapped_out_)
     NavigateToSwappedOutURL(webview()->mainFrame());
 }
 
 RenderViewImpl::~RenderViewImpl() {
+  if (RenderThreadImpl::current()->layout_test_mode()) {

[Inactive, 2014/05/28 12:02:20]

nit: Useless curly brackets?

[ostap, 2014/05/28 19:17:05]

Done.

+    RendererWebKitPlatformSupportImpl::ResetMockScreenOrientationRenderView();

[mlamouri (slow - plz ping), 2014/05/28 13:45:20]

Can't we make the render_view_ reset happen in
ResetMockScreenOrientationForTesting() instead? Adding things in
render_view_impl makes me uneasy and I given that we call
ResetMockScreenOrientationForTesting() between tests, we should be fine if we
reset the render_view_ member there, right?

[ostap, 2014/05/28 19:17:05]

I think using ResetMockScreenOrientationForTesting() is a good idea since it is
not necessary to introduce another method.
But I think it is still required to track render view deallocation because we
can get difficult to debug crash if one of tests fails to call
ResetMockScreenOrientationForTesting() for some reason.

[mlamouri (slow - plz ping), 2014/05/29 14:51:55]

AFAIK, we use the same RenderView during the LayoutTests so we shouldn't even
have to call this and ::Reset() is meant to be used exactly for cleaning up
things between tests. I'm not an owner of that file, but I think adding this
there isn't right.

+  }
   for (BitmapMap::iterator it = disambiguation_bitmaps_.begin();
        it != disambiguation_bitmaps_.end();
        ++it)
     delete it->second;
   history_page_ids_.clear();
 
   base::debug::TraceLog::GetInstance()->RemoveProcessLabel(routing_id_);
 
   // If file chooser is still waiting for answer, dispatch empty answer.
   while (!file_chooser_completions_.empty()) {
@@ skipping 3235 matching lines @@
     std::vector<gfx::Size> sizes;
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content