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

content/browser/renderer_host/mock_render_process_host.cc

 // Copyright (c) 2011 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"
+#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),
           bad_msg_count_(0),
           factory_(NULL),
           id_(ChildProcessInfo::GenerateChildProcessUniqueId()),
           browser_context_(browser_context),
           max_page_id_(-1),
           fast_shutdown_started_(false) {
   // 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() {
   ChildProcessSecurityPolicy::GetInstance()->Remove(GetID());
   delete transport_dib_;
   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() {
 }
 
 bool MockRenderProcessHost::Init(bool is_accessibility_enabled) {
   return true;
 }
 
 int MockRenderProcessHost::GetNextRoutingID() {
@@ skipping 109 matching lines @@
   Cleanup();
 }
 
 void MockRenderProcessHost::Cleanup() {
   if (listeners_.IsEmpty()) {
     content::NotificationService::current()->Notify(
         content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
         content::Source<RenderProcessHost>(this),
         content::NotificationService::NoDetails());
     MessageLoop::current()->DeleteSoon(FROM_HERE, this);
-    g_all_hosts.Get().Remove(GetID());
+    RenderProcessHostImpl::UnregisterHost(GetID());
   }
 }
 
 void MockRenderProcessHost::ReportExpectingClose(int32 listener_id) {
 }
 
 void MockRenderProcessHost::AddPendingView() {
 }
 
 void MockRenderProcessHost::RemovePendingView() {
@@ skipping 71 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;
     }
   }
 }