Index: chrome/browser/task_manager/task_manager_resource_providers.cc |
=================================================================== |
--- chrome/browser/task_manager/task_manager_resource_providers.cc (revision 118420) |
+++ chrome/browser/task_manager/task_manager_resource_providers.cc (working copy) |
@@ -41,9 +41,10 @@ |
#include "chrome/common/extensions/extension.h" |
#include "chrome/common/render_messages.h" |
#include "chrome/common/url_constants.h" |
-#include "content/browser/browser_child_process_host.h" |
#include "content/browser/renderer_host/render_view_host.h" |
+#include "content/public/browser/browser_child_process_host_iterator.h" |
#include "content/public/browser/browser_thread.h" |
+#include "content/public/browser/child_process_data.h" |
#include "content/public/browser/notification_service.h" |
#include "content/public/browser/render_process_host.h" |
#include "content/public/browser/web_contents.h" |
@@ -64,6 +65,7 @@ |
#include "ui/gfx/icon_util.h" |
#endif // defined(OS_WIN) |
+using content::BrowserChildProcessHostIterator; |
using content::BrowserThread; |
using content::WebContents; |
@@ -1068,11 +1070,11 @@ |
// The ChildProcessData::Iterator has to be used from the IO thread. |
void TaskManagerChildProcessResourceProvider::RetrieveChildProcessData() { |
std::vector<content::ChildProcessData> child_processes; |
- for (BrowserChildProcessHost::Iterator iter; !iter.Done(); ++iter) { |
+ for (BrowserChildProcessHostIterator iter; !iter.Done(); ++iter) { |
// Only add processes which are already started, since we need their handle. |
- if ((*iter)->data().handle == base::kNullProcessHandle) |
+ if (iter.GetData().handle == base::kNullProcessHandle) |
continue; |
- child_processes.push_back((*iter)->data()); |
+ child_processes.push_back(iter.GetData()); |
} |
// Now notify the UI thread that we have retrieved information about child |
// processes. |