Fix idle handlers not being called. The problem was that RenderThread::AddRoute was assuming that e…

content/public/test/mock_render_thread.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/public/test/mock_render_thread.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "content/common/frame_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/renderer/render_process_observer.h"
+#include "content/renderer/render_view_impl.h"
 #include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_sync_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebScriptController.h"
 
 namespace content {
 
 MockRenderThread::MockRenderThread()
     : routing_id_(0),
       surface_id_(0),
@@ skipping 60 matching lines @@
 IPC::SyncMessageFilter* MockRenderThread::GetSyncMessageFilter() {
   return NULL;
 }
 
 scoped_refptr<base::MessageLoopProxy>
     MockRenderThread::GetIOMessageLoopProxy() {
   return scoped_refptr<base::MessageLoopProxy>();
 }
 
 void MockRenderThread::AddRoute(int32 routing_id, IPC::Listener* listener) {
-  // We may hear this for views created from OnCreateWindow as well,
-  // in which case we don't want to track the new widget.
-  if (routing_id_ == routing_id)
-    widget_ = listener;
 }
 
 void MockRenderThread::RemoveRoute(int32 routing_id) {
-  // We may hear this for views created from OnCreateWindow as well,
-  // in which case we don't want to track the new widget.
-  if (routing_id_ == routing_id)
-    widget_ = NULL;
 }
 
 int MockRenderThread::GenerateRoutingID() {
   NOTREACHED();
   return MSG_ROUTING_NONE;
 }
 
 void MockRenderThread::AddFilter(IPC::ChannelProxy::MessageFilter* filter) {
   filter->OnFilterAdded(&sink());
   // Add this filter to a vector so the MockRenderThread::RemoveFilter function
@@ skipping 18 matching lines @@
 }
 
 void MockRenderThread::RemoveObserver(RenderProcessObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void MockRenderThread::SetResourceDispatcherDelegate(
     ResourceDispatcherDelegate* delegate) {
 }
 
-void MockRenderThread::WidgetHidden() {
-}
-
-void MockRenderThread::WidgetRestored() {
-}
-
 void MockRenderThread::EnsureWebKitInitialized() {
 }
 
 void MockRenderThread::RecordAction(const UserMetricsAction& action) {
 }
 
 void MockRenderThread::RecordComputedAction(const std::string& action) {
 }
 
 scoped_ptr<base::SharedMemory>
@@ skipping 44 matching lines @@
 void MockRenderThread::PreCacheFont(const LOGFONT& log_font) {
 }
 
 void MockRenderThread::ReleaseCachedFonts() {
 }
 
 #endif  // OS_WIN
 
 void MockRenderThread::SendCloseMessage() {
   ViewMsg_Close msg(routing_id_);
-  widget_->OnMessageReceived(msg);
+  RenderViewImpl::FromRoutingID(routing_id_)->OnMessageReceived(msg);
 }
 
 // The Widget expects to be returned valid route_id.
 void MockRenderThread::OnCreateWidget(int opener_id,
                                       blink::WebPopupType popup_type,
                                       int* route_id,
                                       int* surface_id) {
   opener_id_ = opener_id;
   *route_id = routing_id_;
   *surface_id = surface_id_;
@@ skipping 50 matching lines @@
 void MockRenderThread::OnDuplicateSection(
     base::SharedMemoryHandle renderer_handle,
     base::SharedMemoryHandle* browser_handle) {
   // We don't have to duplicate the input handles since RenderViewTest does not
   // separate a browser process from a renderer process.
   *browser_handle = renderer_handle;
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace content