Refactor RenderProcessHost to use IPC::Listener instead of RenderWidgetHost

content/browser/renderer_host/render_view_host_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/browser/renderer_host/render_view_host_impl.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 103 matching lines @@
 g_created_callbacks = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderViewHost, public:
 
 // static
 RenderViewHost* RenderViewHost::FromID(int render_process_id,
                                        int render_view_id) {
-  RenderProcessHost* process = RenderProcessHost::FromID(render_process_id);
-  if (!process)
-    return NULL;
-  RenderWidgetHost* widget = process->GetRenderWidgetHostByID(render_view_id);
+  RenderWidgetHost* widget =
+      RenderWidgetHost::FromID(render_process_id, render_view_id);
   if (!widget || !widget->IsRenderView())
     return NULL;
   return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(widget));
 }
 
 // static
 RenderViewHost* RenderViewHost::From(RenderWidgetHost* rwh) {
   DCHECK(rwh->IsRenderView());
   return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(rwh));
 }
@@ skipping 345 matching lines @@
 
   // If we are not running the renderer in process and no other tab is using
   // the hung process, consider it eligible to be killed, assuming it is a real
   // process (unit tests don't have real processes).
   if (hung) {
     base::ProcessHandle process_handle = GetProcess()->GetHandle();
     int views = 0;
 
     // Count the number of widget hosts for the process, which is equivalent to
     // views using the process as of this writing.
-    RenderProcessHost::RenderWidgetHostsIterator iter(
-        GetProcess()->GetRenderWidgetHostsIterator());
-    for (; !iter.IsAtEnd(); iter.Advance())
-      ++views;
+    RenderWidgetHost::List widgets = RenderWidgetHost::GetRenderWidgetHosts();
+    for (RenderWidgetHost::List::const_iterator it = widgets.begin();

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

ditto re size_t

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

Done.

+        it != widgets.end(); ++it) {
+      const RenderWidgetHost* widget = *it;
+      if (widget->GetProcess()->GetID() == GetProcess()->GetID())
+        ++views;
+    }
 
     if (!RenderProcessHost::run_renderer_in_process() &&
         process_handle && views <= 1) {
       // The process can safely be terminated, only if WebContents sets
       // SuddenTerminationAllowed, which indicates that the timer has expired.
       // This is not the case if we load data URLs or about:blank. The reason
       // is that those have no network requests and this code is hit without
       // setting the unresponsiveness timer. This allows a corner case where a
       // navigation to a data URL will leave a process running, if the
       // beforeunload handler completes fine, but the unload handler hangs.
@@ skipping 1594 matching lines @@
   const std::vector<base::FilePath>& file_paths = state.GetReferencedFiles();
   for (std::vector<base::FilePath>::const_iterator file = file_paths.begin();
        file != file_paths.end(); ++file) {
     if (!policy->CanReadFile(GetProcess()->GetID(), *file))
       return false;
   }
   return true;
 }
 
 }  // namespace content