Task Manager: overhaul & re-enable task manager browser tests.

chrome/browser/task_manager/extension_process_resource_provider.cc

Index: chrome/browser/task_manager/extension_process_resource_provider.cc
diff --git a/chrome/browser/task_manager/extension_process_resource_provider.cc b/chrome/browser/task_manager/extension_process_resource_provider.cc
index 247833b66033b3ab7214dce1b3f83fc1fb63429d..b14f4e296d9ae5aef0e85ea77fe0a28cb62c18a9 100644
--- a/chrome/browser/task_manager/extension_process_resource_provider.cc
+++ b/chrome/browser/task_manager/extension_process_resource_provider.cc
@@ -300,17 +300,12 @@ bool ExtensionProcessResourceProvider::
   if (web_contents->GetRenderProcessHost()->IsGuest())
     return false;
   extensions::ViewType view_type = extensions::GetViewType(web_contents);
-  // Don't add WebContents (those are handled by
-  // TabContentsResourceProvider) or background contents (handled
-  // by BackgroundResourceProvider).
-#if defined(USE_ASH)
-  return (view_type != extensions::VIEW_TYPE_TAB_CONTENTS &&
-          view_type != extensions::VIEW_TYPE_BACKGROUND_CONTENTS);
-#else
+  // Don't add tab contents (those are handled by TabContentsResourceProvider)
+  // or background contents (handled by BackgroundResourceProvider) or panels
+  // (handled by PanelResourceProvider)
   return (view_type != extensions::VIEW_TYPE_TAB_CONTENTS &&
           view_type != extensions::VIEW_TYPE_BACKGROUND_CONTENTS &&
           view_type != extensions::VIEW_TYPE_PANEL);
-#endif  // USE_ASH
 }
 
 void ExtensionProcessResourceProvider::AddToTaskManager(
@@ -318,10 +313,10 @@ void ExtensionProcessResourceProvider::AddToTaskManager(
   if (!IsHandledByThisProvider(render_view_host))
     return;
 
+  if (resources_.count(render_view_host))
+    return;
   ExtensionProcessResource* resource =
       new ExtensionProcessResource(render_view_host);
-  if (resources_.find(render_view_host) != resources_.end())
-    return;
   resources_[render_view_host] = resource;
   task_manager_->AddResource(resource);
 }