Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

chrome/browser/task_manager/task_manager_resource_providers.cc

Index: chrome/browser/task_manager/task_manager_resource_providers.cc
===================================================================
--- chrome/browser/task_manager/task_manager_resource_providers.cc	(revision 116109)
+++ chrome/browser/task_manager/task_manager_resource_providers.cc	(working copy)
@@ -388,7 +388,7 @@
   // Then we register for notifications to get new tabs.
   registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_CONNECTED,
                  content::NotificationService::AllBrowserContextsAndSources());
-  registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_SWAPPED,
+  registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_SWAPPED,
                  content::NotificationService::AllBrowserContextsAndSources());
   registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED,
                  content::NotificationService::AllBrowserContextsAndSources());
@@ -411,7 +411,7 @@
       this, content::NOTIFICATION_TAB_CONTENTS_CONNECTED,
       content::NotificationService::AllBrowserContextsAndSources());
   registrar_.Remove(
-      this, content::NOTIFICATION_TAB_CONTENTS_SWAPPED,
+      this, content::NOTIFICATION_WEB_CONTENTS_SWAPPED,
       content::NotificationService::AllBrowserContextsAndSources());
   registrar_.Remove(
       this, content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED,
@@ -500,7 +500,8 @@
   TabContentsWrapper* tab_contents;
   if (type == chrome::NOTIFICATION_INSTANT_COMMITTED) {
     tab_contents = content::Source<TabContentsWrapper>(source).ptr();
-  } else if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
+  } else if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED ||
+             type == content::NOTIFICATION_WEB_CONTENTS_SWAPPED) {
     WebContents* web_contents = content::Source<WebContents>(source).ptr();
     tab_contents = TabContentsWrapper::GetCurrentWrapperForContents(
         web_contents);
@@ -515,7 +516,7 @@
     case content::NOTIFICATION_TAB_CONTENTS_CONNECTED:
       Add(tab_contents);
       break;
-    case content::NOTIFICATION_TAB_CONTENTS_SWAPPED:
+    case content::NOTIFICATION_WEB_CONTENTS_SWAPPED:
       Remove(tab_contents);
       Add(tab_contents);
       break;