| Index: chrome/browser/task_manager/task_manager.cc
|
| diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
|
| index c9df8ec2b9bfebfe96682c4800f78fbc2d308579..9ca0de7e0552f48582b50ce9ef86ec50af5c15d9 100644
|
| --- a/chrome/browser/task_manager/task_manager.cc
|
| +++ b/chrome/browser/task_manager/task_manager.cc
|
| @@ -242,79 +242,32 @@ TaskManagerModel::TaskManagerModel(TaskManager* task_manager)
|
| listen_requests_(0),
|
| update_state_(IDLE),
|
| is_updating_byte_count_(false) {
|
| - // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile1(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| - "437890 TaskManagerModel::TaskManagerModel1"));
|
| -
|
| AddResourceProvider(
|
| new task_manager::BrowserProcessResourceProvider(task_manager));
|
| -
|
| - // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile2(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| - "437890 TaskManagerModel::TaskManagerModel2"));
|
| -
|
| AddResourceProvider(new task_manager::WebContentsResourceProvider(
|
| task_manager,
|
| scoped_ptr<WebContentsInformation>(
|
| new task_manager::BackgroundInformation())));
|
| -
|
| - // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile3(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| - "437890 TaskManagerModel::TaskManagerModel3"));
|
| -
|
| AddResourceProvider(new task_manager::WebContentsResourceProvider(
|
| task_manager,
|
| scoped_ptr<WebContentsInformation>(
|
| new task_manager::TabContentsInformation())));
|
| #if defined(ENABLE_PRINT_PREVIEW)
|
| -
|
| - // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile4(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| - "437890 TaskManagerModel::TaskManagerModel4"));
|
| -
|
| AddResourceProvider(new task_manager::WebContentsResourceProvider(
|
| task_manager,
|
| scoped_ptr<WebContentsInformation>(
|
| new task_manager::PrintingInformation())));
|
| #endif // ENABLE_PRINT_PREVIEW
|
| -
|
| - // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile5(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| - "437890 TaskManagerModel::TaskManagerModel5"));
|
| -
|
| AddResourceProvider(new task_manager::WebContentsResourceProvider(
|
| task_manager,
|
| scoped_ptr<WebContentsInformation>(
|
| new task_manager::PanelInformation())));
|
| -
|
| - // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile6(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| - "437890 TaskManagerModel::TaskManagerModel6"));
|
| -
|
| AddResourceProvider(
|
| new task_manager::ChildProcessResourceProvider(task_manager));
|
| -
|
| - // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile7(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| - "437890 TaskManagerModel::TaskManagerModel7"));
|
| -
|
| AddResourceProvider(new task_manager::WebContentsResourceProvider(
|
| task_manager,
|
| scoped_ptr<WebContentsInformation>(
|
| new task_manager::ExtensionInformation())));
|
| -
|
| - // TODO(vadimt): Remove ScopedTracker below once crbug.com/437890 is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile8(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| - "437890 TaskManagerModel::TaskManagerModel8"));
|
| -
|
| AddResourceProvider(new task_manager::WebContentsResourceProvider(
|
| task_manager,
|
| scoped_ptr<WebContentsInformation>(
|
|
|