Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

content/public/browser/notification_types.h

Index: content/public/browser/notification_types.h
diff --git a/content/public/browser/notification_types.h b/content/public/browser/notification_types.h
index 69eae612df288d8c552cbeec8becf73a8a0829b2..af4535fcf8c674f6e69e33333b5f709ec45a3cee 100644
--- a/content/public/browser/notification_types.h
+++ b/content/public/browser/notification_types.h
@@ -117,10 +117,8 @@ enum NotificationType {
 
   // This notification is sent when a WebContents swaps its render view host
   // with another one, possibly changing processes. The source is a
-  // Source<WebContents> with a pointer to the WebContents.  A
-  // NOTIFICATION_WEB_CONTENTS_DISCONNECTED notification is guaranteed before
-  // the source pointer becomes junk.  Details are the RenderViewHost that
-  // has been replaced, or NULL if the old RVH was shut down.
+  // Source<WebContents> with a pointer to the WebContents, details is a
+  // std::pair::<old RenderViewHost, new RenderViewHost>.

[Charlie Reis, 2013/09/06 22:22:40]

Should we keep the sentence about WEB_CONTENTS_DISCONNECTED?

   // DEPRECATED: Use WebContentsObserver::RenderViewHostSwapped()
   NOTIFICATION_WEB_CONTENTS_SWAPPED,
 
@@ -180,12 +178,6 @@ enum NotificationType {
   // hung view, and no details are expected.
   NOTIFICATION_RENDERER_PROCESS_HANG,
 
-  // This is sent to notify that the RenderViewHost displayed in a WebContents
-  // has changed.  Source is the NavigationController for which the change
-  // happened, details is a
-  // std::pair::<old RenderViewHost, new RenderViewHost>).
-  NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-
   // This is sent when a RenderWidgetHost is being destroyed. The source is
   // the RenderWidgetHost, the details are not used.
   NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,