New Task Manager - Phase 1.3.2.B: Implement Tab Contents Task Providing (Prerender)

chrome/browser/prerender/prerender_contents.cc

Index: chrome/browser/prerender/prerender_contents.cc
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index fb7daa97816557294ef6be57a1d4ed3e29eaf13e..938facc82e9986fa638092cc85a942ef4cef5e7e 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -19,6 +19,7 @@
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/prerender/prerender_resource_throttle.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/task_management/web_contents_tags.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_helpers.h"
 #include "chrome/browser/ui/web_contents_sizer.h"
@@ -279,6 +280,13 @@ void PrerenderContents::StartPrerendering(
   TabHelpers::AttachTabHelpers(prerender_contents_.get());
   content::WebContentsObserver::Observe(prerender_contents_.get());
 
+#if defined(ENABLE_TASK_MANAGER)
+  // Tag the prerender contents with the task manager specific prerender tag, so
+  // that it shows up in the task manager.
+  task_management::WebContentsTags::CreateForPrerenderContents(
+      prerender_contents_.get());
+#endif  // defined(ENABLE_TASK_MANAGER)
+
   web_contents_delegate_.reset(new WebContentsDelegateImpl(this));
   prerender_contents_.get()->SetDelegate(web_contents_delegate_.get());
   // Set the size of the prerender WebContents.
@@ -671,6 +679,13 @@ void PrerenderContents::DestroyWhenUsingTooManyResources() {
 WebContents* PrerenderContents::ReleasePrerenderContents() {
   prerender_contents_->SetDelegate(NULL);
   content::WebContentsObserver::Observe(NULL);
+
+#if defined(ENABLE_TASK_MANAGER)
+  // Here we have to clear the task manager tag we added earlier to our

[gavinp, 2015/06/22 18:38:04]

Nit: Remove "Here we have to".

[afakhry, 2015/06/22 21:56:17]

Done.

+  // WebContents since it's no longer a prerender content.

[gavinp, 2015/06/22 18:38:04]

Nit: "content" --> "contents"

[afakhry, 2015/06/22 21:56:17]

Done.

+  task_management::WebContentsTags::ClearTag(prerender_contents_.get());
+#endif  // defined(ENABLE_TASK_MANAGER)
+
   return prerender_contents_.release();
 }