OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/containers/hash_tables.h" | 6 #include "base/containers/hash_tables.h" |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" | 8 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" |
9 #include "content/browser/dom_storage/session_storage_namespace_impl.h" | 9 #include "content/browser/dom_storage/session_storage_namespace_impl.h" |
10 #include "content/browser/frame_host/navigator.h" | 10 #include "content/browser/frame_host/navigator.h" |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 *target_routing_id = | 63 *target_routing_id = |
64 shell2->web_contents()->GetRenderViewHost()->GetRoutingID(); | 64 shell2->web_contents()->GetRenderViewHost()->GetRoutingID(); |
65 EXPECT_NE(*target_routing_id, | 65 EXPECT_NE(*target_routing_id, |
66 shell->web_contents()->GetRenderViewHost()->GetRoutingID()); | 66 shell->web_contents()->GetRenderViewHost()->GetRoutingID()); |
67 | 67 |
68 // Now, simulate a link click coming from the renderer. | 68 // Now, simulate a link click coming from the renderer. |
69 GURL extension_url("https://bar.com/simple_page.html"); | 69 GURL extension_url("https://bar.com/simple_page.html"); |
70 WebContentsImpl* wc = static_cast<WebContentsImpl*>(shell->web_contents()); | 70 WebContentsImpl* wc = static_cast<WebContentsImpl*>(shell->web_contents()); |
71 wc->GetFrameTree()->root()->navigator()->RequestOpenURL( | 71 wc->GetFrameTree()->root()->navigator()->RequestOpenURL( |
72 wc->GetFrameTree()->root()->current_frame_host(), extension_url, nullptr, | 72 wc->GetFrameTree()->root()->current_frame_host(), extension_url, nullptr, |
73 Referrer(), CURRENT_TAB, false, true); | 73 Referrer(), ui::PAGE_TRANSITION_LINK, CURRENT_TAB, false, true); |
74 | 74 |
75 // Since the navigation above requires a cross-process swap, there will be a | 75 // Since the navigation above requires a cross-process swap, there will be a |
76 // pending RenderViewHost. Ensure it exists and is in a different process | 76 // pending RenderViewHost. Ensure it exists and is in a different process |
77 // than the initial page. | 77 // than the initial page. |
78 RenderViewHostImpl* pending_rvh = | 78 RenderViewHostImpl* pending_rvh = |
79 wc->GetRenderManagerForTesting()->pending_render_view_host(); | 79 wc->GetRenderManagerForTesting()->pending_render_view_host(); |
80 EXPECT_TRUE(pending_rvh != NULL); | 80 EXPECT_TRUE(pending_rvh != NULL); |
81 EXPECT_NE(shell->web_contents()->GetRenderViewHost()->GetProcess()->GetID(), | 81 EXPECT_NE(shell->web_contents()->GetRenderViewHost()->GetProcess()->GetID(), |
82 pending_rvh->GetProcess()->GetID()); | 82 pending_rvh->GetProcess()->GetID()); |
83 | 83 |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
308 // "evil" message doesn't arrive in the intervening period. | 308 // "evil" message doesn't arrive in the intervening period. |
309 ASSERT_TRUE(content::ExecuteScript( | 309 ASSERT_TRUE(content::ExecuteScript( |
310 interstitial_page->GetMainFrame(), | 310 interstitial_page->GetMainFrame(), |
311 "window.domAutomationController.send(\"okay2\");")); | 311 "window.domAutomationController.send(\"okay2\");")); |
312 ASSERT_TRUE(message_queue.WaitForMessage(&message)); | 312 ASSERT_TRUE(message_queue.WaitForMessage(&message)); |
313 ASSERT_EQ("\"okay2\"", message); | 313 ASSERT_EQ("\"okay2\"", message); |
314 ASSERT_EQ("\"okay2\"", interstitial->last_command()); | 314 ASSERT_EQ("\"okay2\"", interstitial->last_command()); |
315 } | 315 } |
316 | 316 |
317 } // namespace content | 317 } // namespace content |
OLD | NEW |