Cast: make global_instance_ more strict

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),
       opener_id_(0),
       new_window_routing_id_(0),
       new_window_main_frame_routing_id_(0),
       new_frame_routing_id_(0) {
 }
 
 MockRenderThread::~MockRenderThread() {
+  while (!filters_.empty()) {
+    scoped_refptr<IPC::ChannelProxy::MessageFilter> filter = filters_.back();
+    filters_.pop_back();
+    filter->OnChannelClosing();

[acolwell GONE FROM CHROMIUM, 2014/02/19 00:11:24]

I think this should also include filter->OnFilterRemoved(). I think we should be
emulating the ChannelProxy::Context::OnChannelClosed() code here
https://code.google.com/p/chromium/codesearch#chromium/src/ipc/ipc_channel_pr...

I'm on the fence about the OnChannelClosing() call you've added here though
because this class does not appear to be emulating the OnChannelConnected() call
so I'm not sure of the OnChannelClosing() call makes sense here.

[hubbe, 2014/02/19 00:29:51]

Better?

+  }
 }
 
 void MockRenderThread::VerifyRunJavaScriptMessageSend(
     const base::string16& expected_alert_message) {
   const IPC::Message* alert_msg =
       sink_.GetUniqueMessageMatching(ViewHostMsg_RunJavaScriptMessage::ID);
   ASSERT_TRUE(alert_msg);
   PickleIterator iter = IPC::SyncMessage::GetDataIterator(alert_msg);
   ViewHostMsg_RunJavaScriptMessage::SendParam alert_param;
   ASSERT_TRUE(IPC::ReadParam(alert_msg, &iter, &alert_param));
@@ skipping 216 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