Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

ui/views/controls/webview/webview.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/webview/webview.h"
 
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_details.h"
@@ skipping 244 matching lines @@
   // The view will not be focused automatically when it is attached, so we need
   // to pass on focus to it if the FocusManager thinks the view is focused. Note
   // that not every Widget has a focus manager.
   FocusManager* const focus_manager = GetFocusManager();
   if (focus_manager && focus_manager->GetFocusedView() == this)
     OnFocus();
 
   registrar_.Add(
       this,
       content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-      content::Source<content::NavigationController>(
-          &web_contents_->GetController()));
+      content::Source<content::WebContents>(web_contents_));
   registrar_.Add(
       this,
       content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
       content::Source<content::WebContents>(web_contents_));
 
 #if defined(OS_WIN) && defined(USE_AURA)
   if (!is_embedding_fullscreen_widget_) {
     web_contents_->SetParentNativeViewAccessible(
         parent()->GetNativeViewAccessible());
   }
@@ skipping 42 matching lines @@
   if (!contents) {
     content::WebContents::CreateParams create_params(
         browser_context, site_instance);
     return content::WebContents::Create(create_params);
   }
 
   return contents;
 }
 
 }  // namespace views