Provide a way for RenderProcessHosts to register themselves in the global host map.

This is in the form of static RegisterHost/UnregisterHost functions in the RenderProcessHostImpl class.

BUG=98716
TEST=No change in functionality. Hopefully it all compiles and works.
Review URL: http://codereview.chromium.org/8597005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110635 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/renderer_host/mock_render_process_host.cc

@@ -8,19 +8,11 @@
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "content/browser/child_process_security_policy.h"
+#include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/common/child_process_info.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 
-// This map is the global list of all renderer processes and is defined in
-// render_process_host_impl.cc
-// TODO(ananta)
-// Clean up this dependency in a subsequent CL.
-extern base::LazyInstance<
-    IDMap<content::RenderProcessHost>,
-    base::LeakyLazyInstanceTraits<IDMap<content::RenderProcessHost> > >
-        g_all_hosts;
-
 MockRenderProcessHost::MockRenderProcessHost(
     content::BrowserContext* browser_context)
         : transport_dib_(NULL),
@@ -33,7 +25,8 @@ MockRenderProcessHost::MockRenderProcessHost(
   // Child process security operations can't be unit tested unless we add
   // ourselves as an existing child process.
   ChildProcessSecurityPolicy::GetInstance()->Add(GetID());
-  g_all_hosts.Get().AddWithID(this, GetID());
+
+  RenderProcessHostImpl::RegisterHost(GetID(), this);
 }
 
 MockRenderProcessHost::~MockRenderProcessHost() {
@@ -42,8 +35,7 @@ MockRenderProcessHost::~MockRenderProcessHost() {
   if (factory_)
     factory_->Remove(this);
   // In unit tests, Release() might not have been called.
-  if (g_all_hosts.Get().Lookup(GetID()))
-    g_all_hosts.Get().Remove(GetID());
+  RenderProcessHostImpl::UnregisterHost(GetID());
 }
 
 void MockRenderProcessHost::EnableSendQueue() {
@@ -173,7 +165,7 @@ void MockRenderProcessHost::Cleanup() {
         content::Source<RenderProcessHost>(this),
         content::NotificationService::NoDetails());
     MessageLoop::current()->DeleteSoon(FROM_HERE, this);
-    g_all_hosts.Get().Remove(GetID());
+    RenderProcessHostImpl::UnregisterHost(GetID());
   }
 }
 

content/browser/renderer_host/render_process_host_impl.cc

@@ -249,14 +249,14 @@ static bool IsSuitableHost(content::RenderProcessHost* host,
   return content::GetContentClient()->browser()->IsSuitableHost(host, site_url);
 }
 
-}  // namespace
-
 // the global list of all renderer processes
 base::LazyInstance<
     IDMap<content::RenderProcessHost>,
     base::LeakyLazyInstanceTraits<IDMap<content::RenderProcessHost> > >
         g_all_hosts = LAZY_INSTANCE_INITIALIZER;
 
+}  // namespace
+
 // static
 bool g_run_renderer_in_process_ = false;
 
@@ -323,7 +323,7 @@ RenderProcessHostImpl::RenderProcessHostImpl(
       base::PLATFORM_FILE_WRITE);
 
   CHECK(!content::ExitedMainMessageLoop());
-  g_all_hosts.Get().AddWithID(this, GetID());
+  RegisterHost(GetID(), this);
   g_all_hosts.Get().set_check_on_null_data(true);
   // Initialize |child_process_activity_time_| to a reasonable value.
   mark_child_process_activity_time();
@@ -344,8 +344,7 @@ RenderProcessHostImpl::~RenderProcessHostImpl() {
   }
 
   ClearTransportDIBCache();
-  if (g_all_hosts.Get().Lookup(GetID()))
-    g_all_hosts.Get().Remove(GetID());
+  UnregisterHost(GetID());
 }
 
 void RenderProcessHostImpl::EnableSendQueue() {
@@ -1104,6 +1103,18 @@ bool RenderProcessHostImpl::FastShutdownStarted() const {
   return fast_shutdown_started_;
 }
 
+// static
+void RenderProcessHostImpl::RegisterHost(int host_id,
+                                         content::RenderProcessHost* host) {
+  g_all_hosts.Get().AddWithID(host, host_id);
+}
+
+// static
+void RenderProcessHostImpl::UnregisterHost(int host_id) {
+  if (g_all_hosts.Get().Lookup(host_id))
+    g_all_hosts.Get().Remove(host_id);
+}
+
 // static
 bool content::RenderProcessHost::run_renderer_in_process() {
   return g_run_renderer_in_process_;

content/browser/renderer_host/render_process_host_impl.h

@@ -115,6 +115,11 @@ class CONTENT_EXPORT RenderProcessHostImpl
     child_process_activity_time_ = base::TimeTicks::Now();
   }
 
+  // Register/unregister the host identified by the host id in the global host
+  // list.
+  static void RegisterHost(int host_id, content::RenderProcessHost* host);
+  static void UnregisterHost(int host_id);
+
  protected:
   // A proxy for our IPC::Channel that lives on the IO thread (see
   // browser_process.h)