Add a Content API around BrowserChildProcessHost, similar to what was done with ChildProcessHost....

chrome/browser/ui/webui/workers_ui.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 "chrome/browser/ui/webui/workers_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_writer.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/worker_host/worker_process_host.h"
+#include "content/public/browser/child_process_data.h"
 #include "content/public/browser/devtools_agent_host_registry.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/worker_service.h"
 #include "content/public/browser/worker_service_observer.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "content/public/common/process_type.h"
 #include "grit/generated_resources.h"
 #include "grit/workers_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::BrowserThread;
+using content::ChildProcessData;
 using content::DevToolsAgentHost;
 using content::DevToolsAgentHostRegistry;
 using content::WebContents;
 using content::WebUIMessageHandler;
 using content::WorkerService;
 using content::WorkerServiceObserver;
 
 static const char kWorkersDataFile[] = "workers_data.json";
 
 static const char kOpenDevToolsCommand[]  = "openDevTools";
 static const char kTerminateWorkerCommand[]  = "terminateWorker";
 
 static const char kWorkerProcessHostIdField[]  = "workerProcessHostId";
 static const char kWorkerRouteIdField[]  = "workerRouteId";
 static const char kUrlField[]  = "url";
 static const char kNameField[]  = "name";
 static const char kPidField[]  = "pid";
 
 namespace {
 
 
-DictionaryValue* BuildWorkerData(
-    WorkerProcessHost* process,
+DictionaryValue* BuildWorkerData(const ChildProcessData& data,
     const WorkerProcessHost::WorkerInstance& instance) {
   DictionaryValue* worker_data = new DictionaryValue();
-  worker_data->SetInteger(kWorkerProcessHostIdField, process->data().id);
+  worker_data->SetInteger(kWorkerProcessHostIdField, data.id);
   worker_data->SetInteger(kWorkerRouteIdField, instance.worker_route_id());
   worker_data->SetString(kUrlField, instance.url().spec());
   worker_data->SetString(kNameField, instance.name());
-  worker_data->SetInteger(kPidField, base::GetProcId(process->data().handle));
+  worker_data->SetInteger(kPidField, base::GetProcId(data.handle));
   return worker_data;
 }
 
 class WorkersUIHTMLSource : public ChromeWebUIDataSource {
  public:
   WorkersUIHTMLSource();
 
   virtual void StartDataRequest(const std::string& path,
                                 bool is_incognito,
                                 int request_id);
@@ skipping 14 matching lines @@
                                            int request_id) {
   if (path == kWorkersDataFile) {
     SendSharedWorkersData(request_id);
   } else {
     ChromeWebUIDataSource::StartDataRequest(path, is_incognito, request_id);
   }
 }
 
 void WorkersUIHTMLSource::SendSharedWorkersData(int request_id) {
     ListValue workers_list;
-    BrowserChildProcessHost::Iterator iter(content::PROCESS_TYPE_WORKER);
-    for (; !iter.Done(); ++iter) {
-      WorkerProcessHost* worker = static_cast<WorkerProcessHost*>(*iter);
-      const WorkerProcessHost::Instances& instances = worker->instances();
+    for (WorkerProcessHostIterator iter; !iter.Done(); ++iter) {
+      const WorkerProcessHost::Instances& instances = iter->instances();
       for (WorkerProcessHost::Instances::const_iterator i = instances.begin();
            i != instances.end(); ++i) {
-         workers_list.Append(BuildWorkerData(worker, *i));
+         workers_list.Append(BuildWorkerData(iter.GetData(), *i));
       }
     }
 
     std::string json_string;
     base::JSONWriter::Write(&workers_list, false, &json_string);
 
     SendResponse(request_id, base::RefCountedString::TakeString(&json_string));
 }
 
 class WorkersDOMHandler : public WebUIMessageHandler {
@@ skipping 37 matching lines @@
   if (!profile)
     return;
   DevToolsAgentHost* agent_host =
       DevToolsAgentHostRegistry::GetDevToolsAgentHostForWorker(
           worker_process_host_id,
           worker_route_id);
   DevToolsWindow::OpenDevToolsWindowForWorker(profile, agent_host);
 }
 
 static void TerminateWorker(int worker_process_id, int worker_route_id) {
-  for (BrowserChildProcessHost::Iterator iter(content::PROCESS_TYPE_WORKER);
-       !iter.Done(); ++iter) {
-    if (iter->data().id == worker_process_id) {
-      WorkerProcessHost* worker = static_cast<WorkerProcessHost*>(*iter);
-      worker->TerminateWorker(worker_route_id);
+  for (WorkerProcessHostIterator iter; !iter.Done(); ++iter) {
+      if (iter.GetData().id == worker_process_id) {
+      iter->TerminateWorker(worker_route_id);
       return;
     }
   }
 }
 
 void WorkersDOMHandler::HandleTerminateWorker(const ListValue* args) {
   std::string worker_process_host_id_str;
   std::string worker_route_id_str;
   int worker_process_host_id;
   int worker_route_id;
@@ skipping 33 matching lines @@
  private:
   friend class base::RefCountedThreadSafe<WorkerCreationDestructionListener>;
   virtual ~WorkerCreationDestructionListener() {
   }
 
   virtual void WorkerCreated(
       WorkerProcessHost* process,
       const WorkerProcessHost::WorkerInstance& instance) OVERRIDE {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
-        base::Bind(&WorkerCreationDestructionListener::NotifyWorkerCreated,
-                   this, base::Owned(BuildWorkerData(process, instance))));
+        base::Bind(
+            &WorkerCreationDestructionListener::NotifyWorkerCreated,
+            this, base::Owned(BuildWorkerData(process->GetData(), instance))));
   }
   virtual void WorkerDestroyed(
       WorkerProcessHost* process,
       int worker_route_id) OVERRIDE {
     DictionaryValue* worker_data = new DictionaryValue();
-    worker_data->SetInteger(kWorkerProcessHostIdField, process->data().id);
+    worker_data->SetInteger(kWorkerProcessHostIdField, process->GetData().id);
     worker_data->SetInteger(kWorkerRouteIdField, worker_route_id);
 
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&WorkerCreationDestructionListener::NotifyWorkerDestroyed,
                    this, base::Owned(worker_data)));
   }
   virtual void WorkerContextStarted(WorkerProcessHost*, int) OVERRIDE {}
 
   void NotifyWorkerCreated(DictionaryValue* worker_data) {
@@ skipping 29 matching lines @@
 
   // Set up the chrome://workers/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
 }
 
 WorkersUI::~WorkersUI() {
   observer_->WorkersUIDestroyed();
   observer_ = NULL;
 }