Index: content/browser/web_contents/render_view_host_manager_unittest.cc |
diff --git a/content/browser/web_contents/render_view_host_manager_unittest.cc b/content/browser/web_contents/render_view_host_manager_unittest.cc |
index 77d6533679a868d7bdb87610a92f0fa3c5892bfe..4b3c762a95a44ec7c3a8874dc18185261b35c1db 100644 |
--- a/content/browser/web_contents/render_view_host_manager_unittest.cc |
+++ b/content/browser/web_contents/render_view_host_manager_unittest.cc |
@@ -564,9 +564,8 @@ TEST_F(RenderViewHostManagerTest, Navigate) { |
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(), |
@@ -642,8 +641,7 @@ TEST_F(RenderViewHostManagerTest, Navigate) { |
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 |
@@ -657,9 +655,8 @@ TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) { |
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(), |
@@ -680,8 +677,7 @@ TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) { |
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. |
@@ -794,8 +790,7 @@ TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) { |
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. |