Get rid of the ChildProcessInfo class. It was carrying unnecessary data, and the fact that some p...

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/common/child_process_host.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 
 MockRenderProcessHost::MockRenderProcessHost(
     content::BrowserContext* browser_context)
         : transport_dib_(NULL),
           bad_msg_count_(0),
           factory_(NULL),
-          id_(ChildProcessInfo::GenerateChildProcessUniqueId()),
+          id_(ChildProcessHost::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());
 
   RenderProcessHostImpl::RegisterHost(GetID(), this);
 }
 
@@ skipping 218 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;
     }
   }
 }