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

content/browser/browser_child_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/browser_child_process_host.h"
 
+#include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "content/browser/renderer_host/resource_message_filter.h"
 #include "content/browser/trace_message_filter.h"
 #include "content/common/plugin_messages.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/child_process_data.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 
 #if defined(OS_WIN)
 #include "base/synchronization/waitable_event.h"
 #else
 #include "base/bind.h"
 #endif
 
 using content::BrowserThread;
 
 namespace {
 
 typedef std::list<BrowserChildProcessHost*> ChildProcessList;
 static base::LazyInstance<ChildProcessList> g_child_process_list =
     LAZY_INSTANCE_INITIALIZER;
 
-// The NotificationTask is used to notify about plugin process connection/
-// disconnection. It is needed because the notifications in the
-// NotificationService must happen in the main thread.
-class ChildNotificationTask : public Task {
- public:
-  ChildNotificationTask(
-      int notification_type, ChildProcessInfo* info)
-      : notification_type_(notification_type), info_(*info) { }
-
-  virtual void Run() {
-    content::NotificationService::current()->
-        Notify(notification_type_, content::NotificationService::AllSources(),
-               content::Details<ChildProcessInfo>(&info_));
-  }
-
- private:
-  int notification_type_;
-  ChildProcessInfo info_;
-};
+// Helper functions since the child process related notifications happen on the
+// UI thread.
+void ChildNotificationHelper(int notification_type,
+                             content::ChildProcessData data) {
+  content::NotificationService::current()->
+        Notify(notification_type, content::NotificationService::AllSources(),
+               content::Details<content::ChildProcessData>(&data));
+}
 
 }  // namespace
 
 BrowserChildProcessHost::BrowserChildProcessHost(
     content::ProcessType type)
-    : ChildProcessInfo(type, -1),
-      ALLOW_THIS_IN_INITIALIZER_LIST(client_(this)),
+    : ALLOW_THIS_IN_INITIALIZER_LIST(client_(this)),
 #if !defined(OS_WIN)
       ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)),
 #endif
       disconnect_was_alive_(false) {
+  data_.type = type;
+  data_.id = GenerateChildProcessUniqueId();
+
   AddFilter(new TraceMessageFilter);
 
   g_child_process_list.Get().push_back(this);
 }
 
 BrowserChildProcessHost::~BrowserChildProcessHost() {
   g_child_process_list.Get().remove(this);
 }
 
 // static
@@ skipping 40 matching lines @@
   ChildProcessHost::ForceShutdown();
 }
 
 void BrowserChildProcessHost::SetTerminateChildOnShutdown(
   bool terminate_on_shutdown) {
   child_process_->SetTerminateChildOnShutdown(terminate_on_shutdown);
 }
 
 void BrowserChildProcessHost::Notify(int type) {
   BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE, new ChildNotificationTask(type, this));
+      BrowserThread::UI,
+      FROM_HERE,
+      base::Bind(&ChildNotificationHelper, type, data_));
 }
 
 base::TerminationStatus BrowserChildProcessHost::GetChildTerminationStatus(
     int* exit_code) {
   return child_process_->GetChildTerminationStatus(exit_code);
 }
 
 void BrowserChildProcessHost::OnChannelConnected(int32 peer_pid) {
   Notify(content::NOTIFICATION_CHILD_PROCESS_HOST_CONNECTED);
 }
@@ skipping 101 matching lines @@
 
 BrowserChildProcessHost::ClientHook::ClientHook(BrowserChildProcessHost* host)
     : host_(host) {
 }
 
 void BrowserChildProcessHost::ClientHook::OnProcessLaunched() {
   if (!host_->child_process_->GetHandle()) {
     host_->OnChildDied();
     return;
   }
-  host_->set_handle(host_->child_process_->GetHandle());
+  host_->data_.handle = host_->child_process_->GetHandle();
   host_->OnProcessLaunched();
 }
 
 BrowserChildProcessHost::Iterator::Iterator()
     : all_(true), type_(content::PROCESS_TYPE_UNKNOWN) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)) <<
-          "ChildProcessInfo::Iterator must be used on the IO thread.";
+          "BrowserChildProcessHost::Iterator must be used on the IO thread.";
   iterator_ = g_child_process_list.Get().begin();
 }
 
 BrowserChildProcessHost::Iterator::Iterator(content::ProcessType type)
     : all_(false), type_(type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)) <<
-          "ChildProcessInfo::Iterator must be used on the IO thread.";
+          "BrowserChildProcessHost::Iterator must be used on the IO thread.";
   iterator_ = g_child_process_list.Get().begin();
   if (!Done() && (*iterator_)->type() != type_)
     ++(*this);
 }
 
 BrowserChildProcessHost* BrowserChildProcessHost::Iterator::operator++() {
   do {
     ++iterator_;
     if (Done())
       break;
 
     if (!all_ && (*iterator_)->type() != type_)
       continue;
 
     return *iterator_;
   } while (true);
 
   return NULL;
 }
 
 bool BrowserChildProcessHost::Iterator::Done() {
   return iterator_ == g_child_process_list.Get().end();
 }