Make TaskManager not use ChildProcessInfo. After this change, I will make BrowserChildProcessHost...

chrome/browser/task_manager/task_manager_resource_providers.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 CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_RESOURCE_PROVIDERS_H_
 #define CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_RESOURCE_PROVIDERS_H_
 #pragma once
 
 #include <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/process_util.h"
 #include "chrome/browser/task_manager/task_manager.h"
-#include "content/common/child_process_info.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "content/public/common/process_type.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
 
 class BackgroundContents;
 class BalloonHost;
 class Extension;
 class ExtensionHost;
 class RenderViewHost;
 class TabContentsWrapper;
 
 // These file contains the resource providers used in the task manager.
@@ skipping 197 matching lines @@
   Resources resources_;
 
   // A scoped container for notification registries.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskManagerBackgroundContentsResourceProvider);
 };
 
 class TaskManagerChildProcessResource : public TaskManager::Resource {
  public:
-  explicit TaskManagerChildProcessResource(const ChildProcessInfo& child_proc);
+  TaskManagerChildProcessResource(content::ProcessType type,
+                                  const string16& name,
+                                  base::ProcessHandle handle);
   virtual ~TaskManagerChildProcessResource();
 
   // TaskManager::Resource methods:
   virtual string16 GetTitle() const OVERRIDE;
   virtual string16 GetProfileName() const OVERRIDE;
   virtual SkBitmap GetIcon() const OVERRIDE;
   virtual base::ProcessHandle GetProcess() const OVERRIDE;
   virtual Type GetType() const OVERRIDE;
   virtual bool SupportNetworkUsage() const OVERRIDE;
   virtual void SetSupportNetworkUsage() OVERRIDE;
 
   // Returns the pid of the child process.
   int process_id() const { return pid_; }
 
  private:
   // Returns a localized title for the child process.  For example, a plugin
   // process would be "Plug-in: Flash" when name is "Flash".
   string16 GetLocalizedTitle() const;
 
-  ChildProcessInfo child_process_;
+  content::ProcessType type_;
+  string16 name_;
+  base::ProcessHandle handle_;
   int pid_;
   mutable string16 title_;
   bool network_usage_support_;
 
   // The icon painted for the child processs.
   // TODO(jcampan): we should have plugin specific icons for well-known
   // plugins.
   static SkBitmap* default_icon_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskManagerChildProcessResource);
 };
 
 class TaskManagerChildProcessResourceProvider
     : public TaskManager::ResourceProvider,
       public content::NotificationObserver {
  public:
   explicit TaskManagerChildProcessResourceProvider(TaskManager* task_manager);
 
   virtual TaskManager::Resource* GetResource(int origin_pid,
                                              int render_process_host_id,
                                              int routing_id) OVERRIDE;
   virtual void StartUpdating() OVERRIDE;
   virtual void StopUpdating() OVERRIDE;
 
   // content::NotificationObserver method:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // Retrieves the current ChildProcessInfo (performed in the IO thread).
+ private:
+  struct ChildProcessData {
+    content::ProcessType type;
+    string16 name;
+    base::ProcessHandle handle;
+  };
+
+  virtual ~TaskManagerChildProcessResourceProvider();
+
+  // Retrieves information about the running ChildProcessHosts (performed in the
+  // IO thread).
   virtual void RetrieveChildProcessInfo();
 
-  // Notifies the UI thread that the ChildProcessInfo have been retrieved.
-  virtual void ChildProcessInfoRetreived();
+  // Notifies the UI thread that the ChildProcessHosts information have been
+  // retrieved.
+  virtual void ChildProcessInfoRetreived(
+      const std::vector<ChildProcessData>& child_processes);
+
+  void Add(const ChildProcessData& child_process_data);
+  void Remove(const ChildProcessData& child_process_data);
+
+  void AddToTaskManager(const ChildProcessData& child_process_data);
+
+  TaskManager* task_manager_;
 
   // Whether we are currently reporting to the task manager. Used to ignore
   // notifications sent after StopUpdating().
   bool updating_;
 
-  // The list of ChildProcessInfo retrieved when starting the update.
-  std::vector<ChildProcessInfo> existing_child_process_info_;
-
- private:
-  virtual ~TaskManagerChildProcessResourceProvider();
-
-  void Add(const ChildProcessInfo& child_process_info);
-  void Remove(const ChildProcessInfo& child_process_info);
-
-  void AddToTaskManager(const ChildProcessInfo& child_process_info);
-
-  TaskManager* task_manager_;
-
   // Maps the actual resources (the ChildProcessInfo) to the Task Manager
   // resources.
-  std::map<ChildProcessInfo, TaskManagerChildProcessResource*> resources_;
+  typedef std::map<base::ProcessHandle, TaskManagerChildProcessResource*>
+      ChildProcessMap;
+  ChildProcessMap resources_;
 
   // Maps the pids to the resources (used for quick access to the resource on
   // byte read notifications).
-  std::map<int, TaskManagerChildProcessResource*> pid_to_resources_;
+  typedef std::map<int, TaskManagerChildProcessResource*> PidResourceMap;
+  PidResourceMap pid_to_resources_;
 
   // A scoped container for notification registries.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskManagerChildProcessResourceProvider);
 };
 
 class TaskManagerExtensionProcessResource : public TaskManager::Resource {
  public:
   explicit TaskManagerExtensionProcessResource(ExtensionHost* extension_host);
@@ skipping 185 matching lines @@
   virtual void StartUpdating() OVERRIDE;
   virtual void StopUpdating() OVERRIDE;
 
   // Whether we are currently reporting to the task manager. Used to ignore
   // notifications sent after StopUpdating().
   bool updating_;
 
  private:
   virtual ~TaskManagerBrowserProcessResourceProvider();
 
-  void AddToTaskManager(ChildProcessInfo child_process_info);
-
   TaskManager* task_manager_;
   TaskManagerBrowserProcessResource resource_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskManagerBrowserProcessResourceProvider);
 };
 
 #endif  // CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_RESOURCE_PROVIDERS_H_