Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

content/browser/web_contents/render_view_host_manager_unittest.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 "base/strings/utf_string_conversions.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/browser/web_contents/navigation_entry_impl.h"
 #include "content/browser/web_contents/render_view_host_manager.h"
@@ skipping 546 matching lines @@
 
 // Tests the Navigate function. We navigate three sites consecutively and check
 // how the pending/committed RenderViewHost are modified.
 TEST_F(RenderViewHostManagerTest, Navigate) {
   TestNotificationTracker notifications;
 
   SiteInstance* instance = SiteInstance::Create(browser_context());
 
   scoped_ptr<TestWebContents> web_contents(
       TestWebContents::Create(browser_context(), instance));
-  notifications.ListenFor(
-      NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-      Source<NavigationController>(&web_contents->GetController()));
+  notifications.ListenFor(NOTIFICATION_WEB_CONTENTS_SWAPPED,
+                          Source<WebContents>(web_contents.get()));
 
   // Create.
   RenderViewHostManager manager(web_contents.get(), web_contents.get(),
                                 web_contents.get());
 
   manager.Init(browser_context(), instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE);
 
   RenderViewHost* host;
 
   // 1) The first navigation. --------------------------
@@ skipping 55 matching lines @@
   // Commit.
   manager.DidNavigateMainFrame(manager.pending_render_view_host());
   EXPECT_TRUE(host == manager.current_host());
   ASSERT_TRUE(host);
   EXPECT_TRUE(static_cast<SiteInstanceImpl*>(host->GetSiteInstance())->
       HasSite());
   // Check the pending RenderViewHost has been committed.
   EXPECT_FALSE(manager.pending_render_view_host());
 
   // We should observe a notification.
-  EXPECT_TRUE(notifications.Check1AndReset(
-      NOTIFICATION_RENDER_VIEW_HOST_CHANGED));
+  EXPECT_TRUE(notifications.Check1AndReset(NOTIFICATION_WEB_CONTENTS_SWAPPED));
 }
 
 // Tests the Navigate function. In this unit test we verify that the Navigate
 // function can handle a new navigation event before the previous navigation
 // has been committed. This is also a regression test for
 // http://crbug.com/104600.
 TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) {
   TestNotificationTracker notifications;
 
   SiteInstance* instance = SiteInstance::Create(browser_context());
 
   scoped_ptr<TestWebContents> web_contents(
       TestWebContents::Create(browser_context(), instance));
-  notifications.ListenFor(
-      NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-      Source<NavigationController>(&web_contents->GetController()));
+  notifications.ListenFor(NOTIFICATION_WEB_CONTENTS_SWAPPED,
+                          Source<WebContents>(web_contents.get()));
 
   // Create.
   RenderViewHostManager manager(web_contents.get(), web_contents.get(),
                                 web_contents.get());
 
   manager.Init(browser_context(), instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE);
 
   // 1) The first navigation. --------------------------
   const GURL kUrl1("http://www.google.com/");
   NavigationEntryImpl entry1(NULL /* instance */, -1 /* page_id */, kUrl1,
                              Referrer(), string16() /* title */,
                              PAGE_TRANSITION_TYPED,
                              false /* is_renderer_init */);
   RenderViewHost* host = manager.Navigate(entry1);
 
   // The RenderViewHost created in Init will be reused.
   EXPECT_TRUE(host == manager.current_host());
   EXPECT_FALSE(manager.pending_render_view_host());
 
   // We should observe a notification.
-  EXPECT_TRUE(notifications.Check1AndReset(
-      NOTIFICATION_RENDER_VIEW_HOST_CHANGED));
+  EXPECT_TRUE(notifications.Check1AndReset(NOTIFICATION_WEB_CONTENTS_SWAPPED));
   notifications.Reset();
 
   // Commit.
   manager.DidNavigateMainFrame(host);
 
   // Commit to SiteInstance should be delayed until RenderView commit.
   EXPECT_TRUE(host == manager.current_host());
   ASSERT_TRUE(host);
   EXPECT_FALSE(static_cast<SiteInstanceImpl*>(host->GetSiteInstance())->
       HasSite());
@@ skipping 92 matching lines @@
   // Commit.
   manager.DidNavigateMainFrame(host3);
   EXPECT_TRUE(host3 == manager.current_host());
   ASSERT_TRUE(host3);
   EXPECT_TRUE(static_cast<SiteInstanceImpl*>(host3->GetSiteInstance())->
       HasSite());
   // Check the pending RenderViewHost has been committed.
   EXPECT_FALSE(manager.pending_render_view_host());
 
   // We should observe a notification.
-  EXPECT_TRUE(notifications.Check1AndReset(
-      NOTIFICATION_RENDER_VIEW_HOST_CHANGED));
+  EXPECT_TRUE(notifications.Check1AndReset(NOTIFICATION_WEB_CONTENTS_SWAPPED));
 }
 
 // Tests WebUI creation.
 TEST_F(RenderViewHostManagerTest, WebUI) {
   set_should_create_webui(true);
   SiteInstance* instance = SiteInstance::Create(browser_context());
 
   scoped_ptr<TestWebContents> web_contents(
       TestWebContents::Create(browser_context(), instance));
   RenderViewHostManager manager(web_contents.get(), web_contents.get(),
@@ skipping 396 matching lines @@
 
   // Commit.
   manager.DidNavigateMainFrame(host);
   EXPECT_EQ(host, manager.current_host());
   ASSERT_TRUE(host);
   EXPECT_EQ(static_cast<SiteInstanceImpl*>(host->GetSiteInstance()),
       instance);
 }
 
 }  // namespace content