Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

chrome/browser/task_manager/tab_contents_resource_provider.cc

Index: chrome/browser/task_manager/tab_contents_resource_provider.cc
diff --git a/chrome/browser/task_manager/tab_contents_resource_provider.cc b/chrome/browser/task_manager/tab_contents_resource_provider.cc
index d8a4e01cabd8f25243bdb8d83897d6f46ae520e7..549f9a5510a86f81458ce691d42e52370b871532 100644
--- a/chrome/browser/task_manager/tab_contents_resource_provider.cc
+++ b/chrome/browser/task_manager/tab_contents_resource_provider.cc
@@ -258,7 +258,7 @@ void TabContentsResourceProvider::StartUpdating() {
   // Then we register for notifications to get new web contents.
   registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_CONNECTED,
                  content::NotificationService::AllBrowserContextsAndSources());
-  registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_SWAPPED,
+  registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
                  content::NotificationService::AllBrowserContextsAndSources());
   registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED,
                  content::NotificationService::AllBrowserContextsAndSources());
@@ -271,7 +271,7 @@ void TabContentsResourceProvider::StopUpdating() {
   // Then we unregister for notifications to get new web contents.
   registrar_.Remove(this, content::NOTIFICATION_WEB_CONTENTS_CONNECTED,
       content::NotificationService::AllBrowserContextsAndSources());
-  registrar_.Remove(this, content::NOTIFICATION_WEB_CONTENTS_SWAPPED,
+  registrar_.Remove(this, content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
       content::NotificationService::AllBrowserContextsAndSources());
   registrar_.Remove(this, content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED,
       content::NotificationService::AllBrowserContextsAndSources());
@@ -351,7 +351,7 @@ void TabContentsResourceProvider::Observe(
     case content::NOTIFICATION_WEB_CONTENTS_CONNECTED:
       Add(web_contents);
       break;
-    case content::NOTIFICATION_WEB_CONTENTS_SWAPPED:
+    case content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED:
       Remove(web_contents);
       Add(web_contents);
       break;