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 ea35e6ba05f5e0931f45df0b4b2e530563d2a2c3..6cac4bf289a6edd92bdb02c3d0cb1d7d77e48585 100644 |
--- a/content/browser/web_contents/render_view_host_manager_unittest.cc |
+++ b/content/browser/web_contents/render_view_host_manager_unittest.cc |
@@ -545,7 +545,11 @@ TEST_F(RenderViewHostManagerTest, Init) { |
RenderViewHostManager manager(web_contents.get(), web_contents.get(), |
web_contents.get()); |
- manager.Init(browser_context(), instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE); |
+ manager.Init(browser_context(), |
+ instance, |
+ MSG_ROUTING_NONE, |
+ MSG_ROUTING_NONE, |
+ false); |
RenderViewHost* host = manager.current_host(); |
ASSERT_TRUE(host); |
@@ -572,7 +576,11 @@ TEST_F(RenderViewHostManagerTest, Navigate) { |
RenderViewHostManager manager(web_contents.get(), web_contents.get(), |
web_contents.get()); |
- manager.Init(browser_context(), instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE); |
+ manager.Init(browser_context(), |
+ instance, |
+ MSG_ROUTING_NONE, |
+ MSG_ROUTING_NONE, |
+ false); |
RenderViewHost* host; |
@@ -582,7 +590,7 @@ TEST_F(RenderViewHostManagerTest, Navigate) { |
NULL /* instance */, -1 /* page_id */, kUrl1, Referrer(), |
string16() /* title */, PAGE_TRANSITION_TYPED, |
false /* is_renderer_init */); |
- host = manager.Navigate(entry1); |
+ host = manager.Navigate(entry1, false); |
// The RenderViewHost created in Init will be reused. |
EXPECT_TRUE(host == manager.current_host()); |
@@ -604,7 +612,7 @@ TEST_F(RenderViewHostManagerTest, Navigate) { |
Referrer(kUrl1, WebKit::WebReferrerPolicyDefault), |
string16() /* title */, PAGE_TRANSITION_LINK, |
true /* is_renderer_init */); |
- host = manager.Navigate(entry2); |
+ host = manager.Navigate(entry2, false); |
// The RenderViewHost created in Init will be reused. |
EXPECT_TRUE(host == manager.current_host()); |
@@ -624,7 +632,7 @@ TEST_F(RenderViewHostManagerTest, Navigate) { |
Referrer(kUrl2, WebKit::WebReferrerPolicyDefault), |
string16() /* title */, PAGE_TRANSITION_LINK, |
false /* is_renderer_init */); |
- host = manager.Navigate(entry3); |
+ host = manager.Navigate(entry3, false); |
// A new RenderViewHost should be created. |
EXPECT_TRUE(manager.pending_render_view_host()); |
@@ -665,7 +673,11 @@ TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) { |
RenderViewHostManager manager(web_contents.get(), web_contents.get(), |
web_contents.get()); |
- manager.Init(browser_context(), instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE); |
+ manager.Init(browser_context(), |
+ instance, |
+ MSG_ROUTING_NONE, |
+ MSG_ROUTING_NONE, |
+ false); |
// 1) The first navigation. -------------------------- |
const GURL kUrl1("http://www.google.com/"); |
@@ -673,7 +685,7 @@ TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) { |
Referrer(), string16() /* title */, |
PAGE_TRANSITION_TYPED, |
false /* is_renderer_init */); |
- RenderViewHost* host = manager.Navigate(entry1); |
+ RenderViewHost* host = manager.Navigate(entry1, false); |
// The RenderViewHost created in Init will be reused. |
EXPECT_TRUE(host == manager.current_host()); |
@@ -701,7 +713,7 @@ TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) { |
string16() /* title */, PAGE_TRANSITION_TYPED, |
false /* is_renderer_init */); |
RenderViewHostImpl* host2 = static_cast<RenderViewHostImpl*>( |
- manager.Navigate(entry2)); |
+ manager.Navigate(entry2, false)); |
int host2_process_id = host2->GetProcess()->GetID(); |
// A new RenderViewHost should be created. |
@@ -753,7 +765,7 @@ TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) { |
PAGE_TRANSITION_TYPED, |
false /* is_renderer_init */); |
test_process_host->sink().ClearMessages(); |
- RenderViewHost* host3 = manager.Navigate(entry3); |
+ RenderViewHost* host3 = manager.Navigate(entry3, false); |
// A new RenderViewHost should be created. host2 is now deleted. |
EXPECT_TRUE(manager.pending_render_view_host()); |
@@ -808,7 +820,11 @@ TEST_F(RenderViewHostManagerTest, WebUI) { |
RenderViewHostManager manager(web_contents.get(), web_contents.get(), |
web_contents.get()); |
- manager.Init(browser_context(), instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE); |
+ manager.Init(browser_context(), |
+ instance, |
+ MSG_ROUTING_NONE, |
+ MSG_ROUTING_NONE, |
+ false); |
EXPECT_FALSE(manager.current_host()->IsRenderViewLive()); |
const GURL kUrl("chrome://foo"); |
@@ -816,7 +832,7 @@ TEST_F(RenderViewHostManagerTest, WebUI) { |
Referrer(), string16() /* title */, |
PAGE_TRANSITION_TYPED, |
false /* is_renderer_init */); |
- RenderViewHost* host = manager.Navigate(entry); |
+ RenderViewHost* host = manager.Navigate(entry, false); |
// We commit the pending RenderViewHost immediately because the previous |
// RenderViewHost was not live. We test a case where it is live in |
@@ -854,8 +870,11 @@ TEST_F(RenderViewHostManagerTest, WebUIInNewTab) { |
TestWebContents::Create(browser_context(), blank_instance)); |
RenderViewHostManager manager1(web_contents1.get(), web_contents1.get(), |
web_contents1.get()); |
- manager1.Init( |
- browser_context(), blank_instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE); |
+ manager1.Init(browser_context(), |
+ blank_instance, |
+ MSG_ROUTING_NONE, |
+ MSG_ROUTING_NONE, |
+ false); |
// Test the case that new RVH is considered live. |
manager1.current_host()->CreateRenderView(string16(), -1, -1); |
@@ -865,7 +884,7 @@ TEST_F(RenderViewHostManagerTest, WebUIInNewTab) { |
Referrer(), string16() /* title */, |
PAGE_TRANSITION_TYPED, |
false /* is_renderer_init */); |
- RenderViewHost* host1 = manager1.Navigate(entry1); |
+ RenderViewHost* host1 = manager1.Navigate(entry1, false); |
// We should have a pending navigation to the WebUI RenderViewHost. |
// It should already have bindings. |
@@ -884,8 +903,8 @@ TEST_F(RenderViewHostManagerTest, WebUIInNewTab) { |
TestWebContents::Create(browser_context(), webui_instance)); |
RenderViewHostManager manager2(web_contents2.get(), web_contents2.get(), |
web_contents2.get()); |
- manager2.Init( |
- browser_context(), webui_instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE); |
+ manager2.Init(browser_context(), |
+ webui_instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE, false); |
// Make sure the new RVH is considered live. This is usually done in |
// RenderWidgetHost::Init when opening a new tab from a link. |
manager2.current_host()->CreateRenderView(string16(), -1, -1); |
@@ -895,7 +914,7 @@ TEST_F(RenderViewHostManagerTest, WebUIInNewTab) { |
Referrer(), string16() /* title */, |
PAGE_TRANSITION_LINK, |
true /* is_renderer_init */); |
- RenderViewHost* host2 = manager2.Navigate(entry2); |
+ RenderViewHost* host2 = manager2.Navigate(entry2, false); |
// No cross-process transition happens because we are already in the right |
// SiteInstance. We should grant bindings immediately. |
@@ -1164,7 +1183,11 @@ TEST_F(RenderViewHostManagerTest, NoSwapOnGuestNavigations) { |
RenderViewHostManager manager(web_contents.get(), web_contents.get(), |
web_contents.get()); |
- manager.Init(browser_context(), instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE); |
+ manager.Init(browser_context(), |
+ instance, |
+ MSG_ROUTING_NONE, |
+ MSG_ROUTING_NONE, |
+ false); |
RenderViewHost* host; |
@@ -1174,7 +1197,7 @@ TEST_F(RenderViewHostManagerTest, NoSwapOnGuestNavigations) { |
NULL /* instance */, -1 /* page_id */, kUrl1, Referrer(), |
string16() /* title */, PAGE_TRANSITION_TYPED, |
false /* is_renderer_init */); |
- host = manager.Navigate(entry1); |
+ host = manager.Navigate(entry1, false); |
// The RenderViewHost created in Init will be reused. |
EXPECT_TRUE(host == manager.current_host()); |
@@ -1197,7 +1220,7 @@ TEST_F(RenderViewHostManagerTest, NoSwapOnGuestNavigations) { |
Referrer(kUrl1, WebKit::WebReferrerPolicyDefault), |
string16() /* title */, PAGE_TRANSITION_LINK, |
true /* is_renderer_init */); |
- host = manager.Navigate(entry2); |
+ host = manager.Navigate(entry2, false); |
// The RenderViewHost created in Init will be reused. |
EXPECT_EQ(host, manager.current_host()); |