Add a Content API around BrowserChildProcessHost, similar to what was done with ChildProcessHost. Now classes like PluginProcessHost don't derive from it, but instead use composition.

I've also moved the iterator class into its own file in the public directory. Since classes don't derive from BrowserChildProcessHost and so can't static_cast from it, I added a template helper that does this.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9150017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118415 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 10 deletions

diff --git a/content/browser/debugger/worker_devtools_manager.cc b/content/browser/debugger/worker_devtools_manager.cc
index 2405fb7..217c946 100644
--- a/content/browser/debugger/worker_devtools_manager.cc
+++ b/content/browser/debugger/worker_devtools_manager.cc
@@ -15,6 +15,7 @@
 #include "content/browser/worker_host/worker_service_impl.h"
 #include "content/common/devtools_messages.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/child_process_data.h"
 #include "content/public/browser/devtools_agent_host_registry.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -292,8 +293,7 @@ void WorkerDevToolsManager::WorkerCreated(
                          instance.resource_context())) {
       worker->Send(new DevToolsAgentMsg_PauseWorkerContextOnStart(
           instance.worker_route_id()));
-      WorkerId new_worker_id(
-        worker->data().id, instance.worker_route_id());
+      WorkerId new_worker_id(worker->GetData().id, instance.worker_route_id());
       paused_workers_[new_worker_id] = it->old_worker_id;
       terminated_workers_.erase(it);
       return;
@@ -305,12 +305,12 @@ void WorkerDevToolsManager::WorkerDestroyed(
     WorkerProcessHost* worker,
     int worker_route_id) {
   InspectedWorkersList::iterator it = FindInspectedWorker(
-      worker->data().id,
+      worker->GetData().id,
       worker_route_id);
   if (it == inspected_workers_.end())
     return;
 
-  WorkerId worker_id(worker->data().id, worker_route_id);
+  WorkerId worker_id(worker->GetData().id, worker_route_id);
   terminated_workers_.push_back(TerminatedInspectedWorker(
       worker_id,
       it->worker_url,
@@ -323,7 +323,7 @@ void WorkerDevToolsManager::WorkerDestroyed(
 
 void WorkerDevToolsManager::WorkerContextStarted(WorkerProcessHost* process,
                                                  int worker_route_id) {
-  WorkerId new_worker_id(process->data().id, worker_route_id);
+  WorkerId new_worker_id(process->GetData().id, worker_route_id);
   PausedWorkers::iterator it = paused_workers_.find(new_worker_id);
   if (it == paused_workers_.end())
     return;
@@ -362,7 +362,7 @@ WorkerDevToolsManager::FindInspectedWorker(
     int host_id, int route_id) {
   InspectedWorkersList::iterator it = inspected_workers_.begin();
   while (it != inspected_workers_.end()) {
-    if (it->host->data().id == host_id && it->route_id == route_id)
+    if (it->host->GetData().id == host_id && it->route_id == route_id)
       break;
     ++it;
   }
@@ -370,10 +370,9 @@ WorkerDevToolsManager::FindInspectedWorker(
 }
 
 static WorkerProcessHost* FindWorkerProcess(int worker_process_id) {
-  BrowserChildProcessHost::Iterator iter(content::PROCESS_TYPE_WORKER);
-  for (; !iter.Done(); ++iter) {
-    if (iter->data().id == worker_process_id)
-      return static_cast<WorkerProcessHost*>(*iter);
+  for (WorkerProcessHostIterator iter; !iter.Done(); ++iter) {
+    if (iter.GetData().id == worker_process_id)
+      return *iter;
   }
   return NULL;
 }
diff --git a/content/browser/debugger/worker_devtools_manager.h b/content/browser/debugger/worker_devtools_manager.h
index 8ee9c1c..d2b2c023 100644
--- a/content/browser/debugger/worker_devtools_manager.h
+++ b/content/browser/debugger/worker_devtools_manager.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <list>
+#include <map>
 #include <string>
 
 #include "base/basictypes.h"