Refactor RenderProcessHost to use IPC::Listener instead of RenderWidgetHost

content/public/test/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/public/test/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_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/storage_partition.h"
 
 namespace content {
 
 MockRenderProcessHost::MockRenderProcessHost(
     BrowserContext* browser_context)
@@ skipping 24 matching lines @@
 
 bool MockRenderProcessHost::Init() {
   return true;
 }
 
 int MockRenderProcessHost::GetNextRoutingID() {
   static int prev_routing_id = 0;
   return ++prev_routing_id;
 }
 
+void MockRenderProcessHost::AddRoute(
+    int32 routing_id,
+    IPC::Listener* listener) {
+  listeners_.AddWithID(listener, routing_id);
+}
+
+void MockRenderProcessHost::RemoveRoute(int32 routing_id) {
+  DCHECK(listeners_.Lookup(routing_id) != NULL);
+  listeners_.Remove(routing_id);
+  Cleanup();
+}
+
 void MockRenderProcessHost::SimulateSwapOutACK(
     const ViewMsg_SwapOut_Params& params) {
 }
 
 bool MockRenderProcessHost::WaitForBackingStoreMsg(
     int render_widget_id,
     const base::TimeDelta& max_delay,
     IPC::Message* msg) {
   return false;
 }
@@ skipping 84 matching lines @@
   return true;
 }
 
 void MockRenderProcessHost::SetIgnoreInputEvents(bool ignore_input_events) {
 }
 
 bool MockRenderProcessHost::IgnoreInputEvents() const {
   return false;
 }
 
-void MockRenderProcessHost::Attach(RenderWidgetHost* host,
-                                   int routing_id) {
-  render_widget_hosts_.AddWithID(host, routing_id);
-}
-
-void MockRenderProcessHost::Release(int routing_id) {
-  render_widget_hosts_.Remove(routing_id);
-  Cleanup();
-}
-
 void MockRenderProcessHost::Cleanup() {
-  if (render_widget_hosts_.IsEmpty()) {
+  if (listeners_.IsEmpty()) {
     NotificationService::current()->Notify(
         NOTIFICATION_RENDERER_PROCESS_TERMINATED,
         Source<RenderProcessHost>(this),
         NotificationService::NoDetails());
     base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
     RenderProcessHostImpl::UnregisterHost(GetID());
   }
 }
 
 void MockRenderProcessHost::AddPendingView() {
 }
 
 void MockRenderProcessHost::RemovePendingView() {
 }
 
 void MockRenderProcessHost::SetSuddenTerminationAllowed(bool allowed) {
 }
 
 bool MockRenderProcessHost::SuddenTerminationAllowed() const {
   return true;
 }
 
-RenderWidgetHost* MockRenderProcessHost::GetRenderWidgetHostByID(
-    int routing_id) {
-  return render_widget_hosts_.Lookup(routing_id);
-}
-
 BrowserContext* MockRenderProcessHost::GetBrowserContext() const {
   return browser_context_;
 }
 
 bool MockRenderProcessHost::InSameStoragePartition(
     StoragePartition* partition) const {
   // Mock RPHs only have one partition.
   return true;
 }
 
 IPC::ChannelProxy* MockRenderProcessHost::GetChannel() {
   return NULL;
 }
 
+int MockRenderProcessHost::GetActiveViewCount() {
+  int num_active_views = 0;
+  RenderWidgetHost::List widgets = RenderWidgetHost::GetRenderWidgetHosts();
+  for (RenderWidgetHost::List::const_iterator it = widgets.begin();
+       it != widgets.end(); ++it) {
+    const RenderWidgetHost* widget = *it;
+    DCHECK(widget);
+    if (!widget)

[jam, 2013/06/12 19:59:59]

when can this happen?

[nasko, 2013/06/12 21:18:59]

Missed that, fixed now.

+      continue;
+
+    // Count only RenderWidgetHosts in this process.
+    if (widget->GetProcess()->GetID() != GetID())
+      continue;
+
+    // All RenderWidgetHosts are swapped in.
+    if (!widget->IsRenderView()) {
+      num_active_views++;
+      continue;
+    }
+
+    // Don't count swapped out views.
+    RenderViewHost* rvh =
+        RenderViewHost::From(const_cast<RenderWidgetHost*>(widget));
+    if (!static_cast<RenderViewHostImpl*>(rvh)->is_swapped_out())
+      num_active_views++;
+  }
+  return num_active_views;
+}
+
 bool MockRenderProcessHost::FastShutdownForPageCount(size_t count) {
-  if (render_widget_hosts_.size() == count)
+  if (static_cast<size_t>(GetActiveViewCount()) == count)
     return FastShutdownIfPossible();
   return false;
 }
 
 base::TimeDelta MockRenderProcessHost::GetChildProcessIdleTime() const {
   return base::TimeDelta::FromMilliseconds(0);
 }
 
 void MockRenderProcessHost::SurfaceUpdated(int32 surface_id) {
 }
 
 void MockRenderProcessHost::ResumeRequestsForView(int route_id) {
 }
 
-RenderProcessHost::RenderWidgetHostsIterator
-    MockRenderProcessHost::GetRenderWidgetHostsIterator() {
-  return RenderWidgetHostsIterator(&render_widget_hosts_);
-}
 
 bool MockRenderProcessHost::OnMessageReceived(const IPC::Message& msg) {
-  RenderWidgetHost* rwh = render_widget_hosts_.Lookup(msg.routing_id());
-  if (rwh)
-    return RenderWidgetHostImpl::From(rwh)->OnMessageReceived(msg);
+  IPC::Listener* listener = listeners_.Lookup(msg.routing_id());
+  if (listener)
+    return listener->OnMessageReceived(msg);
   return false;
 }
 
 void MockRenderProcessHost::OnChannelConnected(int32 peer_pid) {
 }
 
 MockRenderProcessHostFactory::MockRenderProcessHostFactory() {}
 
 MockRenderProcessHostFactory::~MockRenderProcessHostFactory() {
   // Detach this object from MockRenderProcesses to prevent STLDeleteElements()
@@ skipping 19 matching lines @@
   for (ScopedVector<MockRenderProcessHost>::iterator it = processes_.begin();
        it != processes_.end(); ++it) {
     if (*it == host) {
       processes_.weak_erase(it);
       break;
     }
   }
 }
 
 }  // content