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

content/browser/browser_child_process_host.h

 // 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.
 
 #ifndef CONTENT_BROWSER_BROWSER_CHILD_PROCESS_HOST_H_
 #define CONTENT_BROWSER_BROWSER_CHILD_PROCESS_HOST_H_
 #pragma once
 
 #include <list>
 
 #include "base/memory/weak_ptr.h"
+#include "base/process.h"
 #include "base/synchronization/waitable_event_watcher.h"
 #include "content/browser/child_process_launcher.h"
 #include "content/common/child_process_host.h"
-#include "content/common/child_process_info.h"
 #include "content/common/content_export.h"
-#include "content/public/common/process_type.h"
+#include "content/public/browser/child_process_data.h"
 
 namespace base {
 class WaitableEvent;
 }
 
 // Plugins/workers and other child processes that live on the IO thread should
 // derive from this class.
 //
 // [Browser]RenderProcessHost is the main exception that doesn't derive from
 // this class. That project lives on the UI thread.
 class CONTENT_EXPORT BrowserChildProcessHost :
     public ChildProcessHost,
-    public ChildProcessInfo,
     public ChildProcessLauncher::Client,
     public base::WaitableEventWatcher::Delegate {
  public:
   virtual ~BrowserChildProcessHost();
 
   virtual void OnWaitableEventSignaled(
       base::WaitableEvent* waitable_event) OVERRIDE;
 
   // Terminates all child processes and deletes each ChildProcessHost instance.
   static void TerminateAll();
@@ skipping 11 matching lines @@
     BrowserChildProcessHost* operator*() { return *iterator_; }
     BrowserChildProcessHost* operator++();
     bool Done();
 
    private:
     bool all_;
     content::ProcessType type_;
     std::list<BrowserChildProcessHost*>::iterator iterator_;
   };
 
+  const content::ChildProcessData& data() const { return data_; }
+  content::ProcessType type() const { return data_.type; }
+  const string16& name() const { return data_.name; }
+  base::ProcessHandle handle() const { return data_.handle; }
+  int id() const { return data_.id; }
+
  protected:
   explicit BrowserChildProcessHost(content::ProcessType type);
 
   // Derived classes call this to launch the child process asynchronously.
   void Launch(
 #if defined(OS_WIN)
       const FilePath& exposed_dir,
 #elif defined(OS_POSIX)
       bool use_zygote,
       const base::environment_vector& environ,
@@ skipping 33 matching lines @@
   // the host list. Calls ChildProcessHost::ForceShutdown
   virtual void ForceShutdown() OVERRIDE;
 
   // Controls whether the child process should be terminated on browser
   // shutdown. Default is to always terminate.
   void SetTerminateChildOnShutdown(bool terminate_on_shutdown);
 
   // Sends the given notification on the UI thread.
   void Notify(int type);
 
+  void set_name(const string16& name) { data_.name = name; }
+  void set_handle(base::ProcessHandle handle) { data_.handle = handle; }
+
  private:
   // By using an internal class as the ChildProcessLauncher::Client, we can
   // intercept OnProcessLaunched and do our own processing before
   // calling the subclass' implementation.
   class ClientHook : public ChildProcessLauncher::Client {
    public:
     explicit ClientHook(BrowserChildProcessHost* host);
     virtual void OnProcessLaunched() OVERRIDE;
    private:
     BrowserChildProcessHost* host_;
   };
 
+  content::ChildProcessData data_;
+
   ClientHook client_;
   scoped_ptr<ChildProcessLauncher> child_process_;
 #if defined(OS_WIN)
   base::WaitableEventWatcher child_watcher_;
 #else
   base::WeakPtrFactory<BrowserChildProcessHost> task_factory_;
 #endif
   bool disconnect_was_alive_;
 };
 
 #endif  // CONTENT_BROWSER_BROWSER_CHILD_PROCESS_HOST_H_