Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

ui/views/controls/webview/webview.cc

Index: ui/views/controls/webview/webview.cc
diff --git a/ui/views/controls/webview/webview.cc b/ui/views/controls/webview/webview.cc
index 89ac03758e5827b7851451fb3ab9c0e7725c19c8..1248723f58d5830438b346aacfded3701b1eaaff 100644
--- a/ui/views/controls/webview/webview.cc
+++ b/ui/views/controls/webview/webview.cc
@@ -161,7 +161,7 @@ gfx::Size WebView::GetPreferredSize() {
 void WebView::Observe(int type,
                       const content::NotificationSource& source,
                       const content::NotificationDetails& details) {
-  if (type == content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED) {
+  if (type == content::NOTIFICATION_WEB_CONTENTS_SWAPPED) {
     std::pair<content::RenderViewHost*, content::RenderViewHost*>*
         switched_details =
             content::Details<std::pair<content::RenderViewHost*,
@@ -230,9 +230,8 @@ void WebView::AttachWebContents() {
 
     registrar_.Add(
         this,
-        content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-        content::Source<content::NavigationController>(
-            &web_contents_->GetController()));
+        content::NOTIFICATION_WEB_CONTENTS_SWAPPED,
+        content::Source<content::WebContents>(web_contents_));
     registrar_.Add(
         this,
         content::NOTIFICATION_WEB_CONTENTS_DESTROYED,