Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

content/public/browser/web_contents_observer.h

Index: content/public/browser/web_contents_observer.h
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
index 81dcf381f7450fc57fd8728c21316632446e7e74..ea5cfb0e1e0cdf26b8bc45afa1d438c29ffde135 100644
--- a/content/public/browser/web_contents_observer.h
+++ b/content/public/browser/web_contents_observer.h
@@ -70,7 +70,8 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener,
   // another one, possibly changing processes. The RenderViewHost that has
   // been replaced is in |old_render_view_host|, which is NULL if the old RVH
   // was shut down.
-  virtual void RenderViewHostSwapped(RenderViewHost* old_render_view_host) {}
+  virtual void RenderViewHostSwapped(RenderViewHost* old_host,
+                                     RenderViewHost* new_host) {}
 
   // This method is invoked after the WebContents decided which RenderViewHost
   // to use for the next navigation, but before the navigation starts.