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

chrome/browser/task_manager/extension_process_resource_provider.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/task_manager/extension_process_resource_provider.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 282 matching lines @@
 bool ExtensionProcessResourceProvider::
     IsHandledByThisProvider(content::RenderViewHost* render_view_host) {
   WebContents* web_contents = WebContents::FromRenderViewHost(render_view_host);
   // Don't add WebContents that belong to a guest (those are handled by
   // GuestResourceProvider). Otherwise they will be added twice, and
   // in this case they will have the app's name as a title (due to the
   // ExtensionProcessResource constructor).
   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 WebContents (those are handled by TabContentsResourceProvider) or

[Avi (use Gerrit), 2014/03/03 22:52:31]

s/WebContents/tab contents/

Everything is a WebContents :) This comment was accidentally broken with a
rename from "TabContents" to "WebContents".

[ncarter (slow), 2014/03/04 01:23:11]

Done.

+  // 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(
     content::RenderViewHost* render_view_host) {
   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);
 }
 
 void ExtensionProcessResourceProvider::RemoveFromTaskManager(
     content::RenderViewHost* render_view_host) {
   if (!updating_)
     return;
   std::map<content::RenderViewHost*, ExtensionProcessResource*>
       ::iterator iter = resources_.find(render_view_host);
   if (iter == resources_.end())
     return;
 
   // Remove the resource from the Task Manager.
   ExtensionProcessResource* resource = iter->second;
   task_manager_->RemoveResource(resource);
 
   // Remove it from the provider.
   resources_.erase(iter);
 
   // Finally, delete the resource.
   delete resource;
 }
 
 }  // namespace task_manager