Merge http://src.chromium.org/viewvc/chrome?view=rev&revision=125923 by

content/browser/renderer_host/mock_render_process_host.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/browser/renderer_host/mock_render_process_host.h"
 
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "content/browser/child_process_security_policy.h"
@@ skipping 187 matching lines @@
     return FastShutdownIfPossible();
   return false;
 }
 
 base::TimeDelta MockRenderProcessHost::GetChildProcessIdleTime() const {
   return base::TimeDelta::FromMilliseconds(0);
 }
 
 content::RenderProcessHost::listeners_iterator
     MockRenderProcessHost::ListenersIterator() {
-  IDMap<IPC::Channel::Listener> listeners;
-  return listeners_iterator(&listeners);
+  return listeners_iterator(&listeners_);
 }
 
 bool MockRenderProcessHost::OnMessageReceived(const IPC::Message& msg) {
   return false;
 }
 
 void MockRenderProcessHost::OnChannelConnected(int32 peer_pid) {
 }
 
 MockRenderProcessHostFactory::MockRenderProcessHostFactory() {}
@@ skipping 20 matching lines @@
 
 void MockRenderProcessHostFactory::Remove(MockRenderProcessHost* host) const {
   for (ScopedVector<MockRenderProcessHost>::iterator it = processes_.begin();
        it != processes_.end(); ++it) {
     if (*it == host) {
       processes_.weak_erase(it);
       break;
     }
   }
 }