Index: chrome/browser/task_manager/task_manager_worker_resource_provider.cc |
=================================================================== |
--- chrome/browser/task_manager/task_manager_worker_resource_provider.cc (revision 118420) |
+++ chrome/browser/task_manager/task_manager_worker_resource_provider.cc (working copy) |
@@ -11,7 +11,6 @@ |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/debugger/devtools_window.h" |
#include "chrome/browser/profiles/profile_manager.h" |
-#include "content/browser/browser_child_process_host.h" |
#include "content/browser/worker_host/worker_process_host.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/child_process_data.h" |
@@ -218,7 +217,7 @@ |
WorkerProcessHost* process, |
const WorkerProcessHost::WorkerInstance& instance) { |
TaskManagerSharedWorkerResource* resource = |
- new TaskManagerSharedWorkerResource(process->data(), |
+ new TaskManagerSharedWorkerResource(process->GetData(), |
instance.worker_route_id(), |
instance.url(), instance.name()); |
BrowserThread::PostTask( |
@@ -233,7 +232,7 @@ |
BrowserThread::PostTask( |
BrowserThread::UI, FROM_HERE, base::Bind( |
&TaskManagerWorkerResourceProvider::NotifyWorkerDestroyed, |
- this, process->data().id, worker_route_id)); |
+ this, process->GetData().id, worker_route_id)); |
} |
void TaskManagerWorkerResourceProvider::Observe( |
@@ -304,14 +303,12 @@ |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
scoped_ptr<WorkerResourceListHolder> holder(new WorkerResourceListHolder); |
- 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) { |
holder->resources()->push_back(new TaskManagerSharedWorkerResource( |
- (*iter)->data(), i->worker_route_id(), i->url(), i->name())); |
+ iter.GetData(), i->worker_route_id(), i->url(), i->name())); |
} |
} |