Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/macros.h" | 6 #include "base/macros.h" |
| 6 #include "base/time/time.h" | 7 #include "base/time/time.h" |
| 7 #include "content/browser/frame_host/navigation_controller_impl.h" | 8 #include "content/browser/frame_host/navigation_controller_impl.h" |
| 8 #include "content/browser/frame_host/navigation_entry_impl.h" | 9 #include "content/browser/frame_host/navigation_entry_impl.h" |
| 9 #include "content/browser/frame_host/navigation_request.h" | 10 #include "content/browser/frame_host/navigation_request.h" |
| 10 #include "content/browser/frame_host/navigation_request_info.h" | 11 #include "content/browser/frame_host/navigation_request_info.h" |
| 11 #include "content/browser/frame_host/navigator.h" | 12 #include "content/browser/frame_host/navigator.h" |
| 12 #include "content/browser/frame_host/navigator_impl.h" | 13 #include "content/browser/frame_host/navigator_impl.h" |
| 13 #include "content/browser/frame_host/render_frame_host_manager.h" | 14 #include "content/browser/frame_host/render_frame_host_manager.h" |
| 14 #include "content/browser/site_instance_impl.h" | 15 #include "content/browser/site_instance_impl.h" |
| 15 #include "content/browser/streams/stream.h" | 16 #include "content/browser/streams/stream.h" |
| 16 #include "content/common/navigation_params.h" | 17 #include "content/common/navigation_params.h" |
| 17 #include "content/public/browser/stream_handle.h" | 18 #include "content/public/browser/stream_handle.h" |
| 19 #include "content/public/common/content_switches.h" | |
| 18 #include "content/public/common/url_constants.h" | 20 #include "content/public/common/url_constants.h" |
| 19 #include "content/public/common/url_utils.h" | 21 #include "content/public/common/url_utils.h" |
| 20 #include "content/test/browser_side_navigation_test_utils.h" | 22 #include "content/test/browser_side_navigation_test_utils.h" |
| 21 #include "content/test/test_navigation_url_loader.h" | 23 #include "content/test/test_navigation_url_loader.h" |
| 22 #include "content/test/test_render_frame_host.h" | 24 #include "content/test/test_render_frame_host.h" |
| 23 #include "content/test/test_web_contents.h" | 25 #include "content/test/test_web_contents.h" |
| 24 #include "net/base/load_flags.h" | 26 #include "net/base/load_flags.h" |
| 25 #include "net/http/http_response_headers.h" | 27 #include "net/http/http_response_headers.h" |
| 26 #include "net/url_request/redirect_info.h" | 28 #include "net/url_request/redirect_info.h" |
| 27 #include "ui/base/page_transition_types.h" | 29 #include "ui/base/page_transition_types.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 66 controller().GetBrowserContext()))); | 68 controller().GetBrowserContext()))); |
| 67 static_cast<NavigatorImpl*>(node->navigator())->RequestNavigation( | 69 static_cast<NavigatorImpl*>(node->navigator())->RequestNavigation( |
| 68 node, *entry, reload_type, base::TimeTicks::Now()); | 70 node, *entry, reload_type, base::TimeTicks::Now()); |
| 69 } | 71 } |
| 70 | 72 |
| 71 NavigationRequest* GetNavigationRequestForFrameTreeNode( | 73 NavigationRequest* GetNavigationRequestForFrameTreeNode( |
| 72 FrameTreeNode* frame_tree_node) { | 74 FrameTreeNode* frame_tree_node) { |
| 73 return static_cast<NavigatorImpl*>(frame_tree_node->navigator()) | 75 return static_cast<NavigatorImpl*>(frame_tree_node->navigator()) |
| 74 ->GetNavigationRequestForNodeForTesting(frame_tree_node); | 76 ->GetNavigationRequestForNodeForTesting(frame_tree_node); |
| 75 } | 77 } |
| 78 | |
| 79 RenderFrameHost* GetSpeculativeRenderFrameHost(RenderFrameHostManager* rfhm) { | |
| 80 return rfhm->speculative_render_frame_host_.get(); | |
| 81 } | |
| 82 | |
| 83 FrameHostMsg_DidCommitProvisionalLoad_Params BuildSimpleDCPLParams(GURL url) { | |
|
clamy
2014/12/16 15:22:48
This is actually a rewrite of some of the helper f
carlosk
2014/12/19 04:27:14
Done.
| |
| 84 FrameHostMsg_DidCommitProvisionalLoad_Params params; | |
| 85 params.page_id = 1; | |
| 86 params.url = url; | |
| 87 params.was_within_same_page = false; | |
| 88 params.is_post = false; | |
| 89 params.post_id = -1; | |
| 90 params.page_state = PageState::CreateForTesting(url, false, 0, 0); | |
| 91 return params; | |
| 92 } | |
| 76 }; | 93 }; |
| 77 | 94 |
| 95 // PlzNavigate: Test final state after a complete navigation (to avoid repeating | |
| 96 // this these checks). | |
|
clamy
2014/12/16 15:22:48
Remove the extra this.
carlosk
2014/12/19 04:27:14
Done.
| |
| 97 TEST_F(NavigatorTestWithBrowserSideNavigation, NavigationFinishedState) { | |
| 98 const GURL kUrl("http://chromium.org/"); | |
| 99 contents()->NavigateAndCommit(kUrl); | |
| 100 ASSERT_TRUE(main_test_rfh()); | |
| 101 RenderFrameHostManager* rfhm = | |
| 102 main_test_rfh()->frame_tree_node()->render_manager(); | |
| 103 EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, main_test_rfh()->rfh_state()); | |
| 104 EXPECT_EQ(SiteInstanceImpl::GetSiteForURL(browser_context(), kUrl), | |
| 105 main_test_rfh()->GetSiteInstance()->GetSiteURL()); | |
| 106 // After a navigation is finished no speculative RenderFrameHost should | |
| 107 // exist. | |
| 108 EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 109 // With PlzNavigate enabled a pending RenderFrameHost should never exist. | |
| 110 EXPECT_FALSE(rfhm->pending_frame_host()); | |
| 111 } | |
| 112 | |
| 78 // PlzNavigate: Test that a proper NavigationRequest is created by | 113 // PlzNavigate: Test that a proper NavigationRequest is created by |
| 79 // BeginNavigation. | 114 // BeginNavigation. |
| 80 // Note that all PlzNavigate methods on the browser side require the use of the | 115 // Note that all PlzNavigate methods on the browser side require the use of the |
| 81 // flag kEnableBrowserSideNavigation. | 116 // flag kEnableBrowserSideNavigation. |
| 82 TEST_F(NavigatorTestWithBrowserSideNavigation, BeginNavigation) { | 117 TEST_F(NavigatorTestWithBrowserSideNavigation, BeginNavigation) { |
| 83 const GURL kUrl1("http://www.google.com/"); | 118 const GURL kUrl1("http://www.google.com/"); |
| 84 const GURL kUrl2("http://www.chromium.org/"); | 119 const GURL kUrl2("http://www.chromium.org/"); |
| 85 const GURL kUrl3("http://www.gmail.com/"); | 120 const GURL kUrl3("http://www.gmail.com/"); |
| 86 | 121 |
| 87 contents()->NavigateAndCommit(kUrl1); | 122 contents()->NavigateAndCommit(kUrl1); |
| 123 FrameTreeNode* root = contents()->GetFrameTree()->root(); | |
| 124 RenderFrameHostManager* root_rfhm = root->render_manager(); | |
| 88 | 125 |
| 89 // Add a subframe. | 126 // Add a subframe. |
| 90 FrameTreeNode* root = contents()->GetFrameTree()->root(); | |
| 91 TestRenderFrameHost* subframe_rfh = static_cast<TestRenderFrameHost*>( | 127 TestRenderFrameHost* subframe_rfh = static_cast<TestRenderFrameHost*>( |
| 92 contents()->GetFrameTree()->AddFrame( | 128 contents()->GetFrameTree()->AddFrame( |
| 93 root, root->current_frame_host()->GetProcess()->GetID(), 14, | 129 root, root->current_frame_host()->GetProcess()->GetID(), 14, |
| 94 "Child")); | 130 "Child")); |
| 95 EXPECT_TRUE(subframe_rfh); | 131 EXPECT_TRUE(subframe_rfh); |
| 96 | 132 |
| 97 FrameTreeNode* subframe_node = subframe_rfh->frame_tree_node(); | 133 FrameTreeNode* subframe_node = subframe_rfh->frame_tree_node(); |
| 134 RenderFrameHostManager* subframe_rfhm = subframe_node->render_manager(); | |
| 135 EXPECT_NE(root_rfhm, subframe_rfhm); | |
| 136 | |
| 98 SendRequestNavigation(subframe_rfh->frame_tree_node(), kUrl2); | 137 SendRequestNavigation(subframe_rfh->frame_tree_node(), kUrl2); |
| 99 // There is no previous renderer in the subframe, so BeginNavigation is | 138 // There is no previous renderer in the subframe, so BeginNavigation is |
| 100 // handled already. | 139 // handled already. |
| 101 NavigationRequest* subframe_request = | 140 NavigationRequest* subframe_request = |
| 102 GetNavigationRequestForFrameTreeNode(subframe_node); | 141 GetNavigationRequestForFrameTreeNode(subframe_node); |
| 103 TestNavigationURLLoader* subframe_loader = | 142 TestNavigationURLLoader* subframe_loader = |
| 104 GetLoaderForNavigationRequest(subframe_request); | 143 GetLoaderForNavigationRequest(subframe_request); |
| 105 ASSERT_TRUE(subframe_request); | 144 ASSERT_TRUE(subframe_request); |
| 106 EXPECT_EQ(kUrl2, subframe_request->common_params().url); | 145 EXPECT_EQ(kUrl2, subframe_request->common_params().url); |
| 107 EXPECT_EQ(kUrl2, subframe_loader->common_params().url); | 146 EXPECT_EQ(kUrl2, subframe_loader->common_params().url); |
| 108 // First party for cookies url should be that of the main frame. | 147 // First party for cookies url should be that of the main frame. |
| 109 EXPECT_EQ(kUrl1, subframe_loader->request_info()->first_party_for_cookies); | 148 EXPECT_EQ(kUrl1, subframe_loader->request_info()->first_party_for_cookies); |
| 110 EXPECT_FALSE(subframe_loader->request_info()->is_main_frame); | 149 EXPECT_FALSE(subframe_loader->request_info()->is_main_frame); |
| 111 EXPECT_TRUE(subframe_loader->request_info()->parent_is_main_frame); | 150 EXPECT_TRUE(subframe_loader->request_info()->parent_is_main_frame); |
| 112 | 151 |
| 152 // Subframe navigations should not create a speculative RenderFrameHost. | |
| 153 // (unless site-per-process is enabled). | |
| 154 EXPECT_FALSE(GetSpeculativeRenderFrameHost(root_rfhm)); | |
|
nasko
2014/12/18 00:22:39
nit: Move this check before the comment as it does
carlosk
2014/12/19 04:27:14
Done.
| |
| 155 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | |
| 156 switches::kSitePerProcess)) { | |
| 157 EXPECT_TRUE(GetSpeculativeRenderFrameHost(subframe_rfhm)); | |
| 158 } else { | |
| 159 EXPECT_FALSE(GetSpeculativeRenderFrameHost(subframe_rfhm)); | |
| 160 } | |
| 161 | |
| 113 SendRequestNavigation(root, kUrl3); | 162 SendRequestNavigation(root, kUrl3); |
| 114 // Simulate a BeginNavigation IPC on the main frame. | 163 // Simulate a BeginNavigation IPC on the main frame. |
| 115 contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl3); | 164 contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl3); |
| 116 NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(root); | 165 NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(root); |
| 117 TestNavigationURLLoader* main_loader = | 166 TestNavigationURLLoader* main_loader = |
| 118 GetLoaderForNavigationRequest(main_request); | 167 GetLoaderForNavigationRequest(main_request); |
| 119 ASSERT_TRUE(main_request); | 168 ASSERT_TRUE(main_request); |
| 120 EXPECT_EQ(kUrl3, main_request->common_params().url); | 169 EXPECT_EQ(kUrl3, main_request->common_params().url); |
| 121 EXPECT_EQ(kUrl3, main_loader->common_params().url); | 170 EXPECT_EQ(kUrl3, main_loader->common_params().url); |
| 122 EXPECT_EQ(kUrl3, main_loader->request_info()->first_party_for_cookies); | 171 EXPECT_EQ(kUrl3, main_loader->request_info()->first_party_for_cookies); |
| 123 EXPECT_TRUE(main_loader->request_info()->is_main_frame); | 172 EXPECT_TRUE(main_loader->request_info()->is_main_frame); |
| 124 EXPECT_FALSE(main_loader->request_info()->parent_is_main_frame); | 173 EXPECT_FALSE(main_loader->request_info()->parent_is_main_frame); |
| 174 | |
| 175 // Main frame navigations to different sites should use a speculative | |
| 176 // RenderFrameHost. | |
| 177 EXPECT_TRUE(GetSpeculativeRenderFrameHost(root_rfhm)); | |
| 178 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | |
| 179 switches::kSitePerProcess)) { | |
| 180 EXPECT_TRUE(GetSpeculativeRenderFrameHost(subframe_rfhm)); | |
| 181 } else { | |
| 182 EXPECT_FALSE(GetSpeculativeRenderFrameHost(subframe_rfhm)); | |
| 183 } | |
| 125 } | 184 } |
| 126 | 185 |
| 127 // PlzNavigate: Test that RequestNavigation creates a NavigationRequest and that | 186 // PlzNavigate: Test that RequestNavigation creates a NavigationRequest and that |
| 128 // RenderFrameHost is not modified when the navigation commits. | 187 // RenderFrameHost is not modified when the navigation commits. |
| 129 TEST_F(NavigatorTestWithBrowserSideNavigation, NoLiveRenderer) { | 188 TEST_F(NavigatorTestWithBrowserSideNavigation, NoLiveRenderer) { |
| 130 const GURL kUrl("http://www.google.com/"); | 189 const GURL kUrl("http://www.google.com/"); |
| 131 | 190 |
| 132 EXPECT_FALSE(main_test_rfh()->render_view_host()->IsRenderViewLive()); | 191 EXPECT_FALSE(main_test_rfh()->render_view_host()->IsRenderViewLive()); |
| 133 FrameTreeNode* node = main_test_rfh()->frame_tree_node(); | 192 RenderFrameHostImpl* rfh = main_test_rfh(); |
| 193 FrameTreeNode* node = rfh->frame_tree_node(); | |
| 194 RenderFrameHostManager* rfhm = node->render_manager(); | |
| 134 SendRequestNavigation(node, kUrl); | 195 SendRequestNavigation(node, kUrl); |
| 196 | |
| 197 // A NavigationRequest should have been generated. | |
| 135 NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); | 198 NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); |
| 136 // A NavigationRequest should have been generated. | |
| 137 EXPECT_TRUE(main_request != NULL); | 199 EXPECT_TRUE(main_request != NULL); |
| 138 RenderFrameHostImpl* rfh = main_test_rfh(); | 200 |
| 201 // As we're re-using the current RenderFrameHost, no speculative one should be | |
| 202 // created. | |
| 203 EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 139 | 204 |
| 140 // Now return the response without any redirects. This will cause the | 205 // Now return the response without any redirects. This will cause the |
| 141 // navigation to commit at the same URL. | 206 // navigation to commit at the same URL. |
| 142 scoped_refptr<ResourceResponse> response(new ResourceResponse); | 207 scoped_refptr<ResourceResponse> response(new ResourceResponse); |
| 143 GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted( | 208 GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted( |
| 144 response, MakeEmptyStream()); | 209 response, MakeEmptyStream()); |
| 145 main_request = GetNavigationRequestForFrameTreeNode(node); | 210 main_request = GetNavigationRequestForFrameTreeNode(node); |
| 146 | 211 |
| 147 // The main RFH should not have been changed, and the renderer should have | 212 // The main RFH should not have been changed, and the renderer should have |
| 148 // been initialized. | 213 // been initialized. |
| 149 EXPECT_EQ(rfh, main_test_rfh()); | 214 EXPECT_EQ(rfh, main_test_rfh()); |
| 150 EXPECT_TRUE(main_test_rfh()->IsRenderFrameLive()); | 215 EXPECT_TRUE(main_test_rfh()->IsRenderFrameLive()); |
| 151 EXPECT_TRUE(main_test_rfh()->render_view_host()->IsRenderViewLive()); | 216 EXPECT_TRUE(main_test_rfh()->render_view_host()->IsRenderViewLive()); |
| 152 } | 217 } |
| 153 | 218 |
| 154 // PlzNavigate: Test that commiting an HTTP 204 or HTTP 205 response cancels the | 219 // PlzNavigate: Test that committing an HTTP 204 or HTTP 205 response cancels |
| 155 // navigation. | 220 // the navigation. |
| 156 TEST_F(NavigatorTestWithBrowserSideNavigation, NoContent) { | 221 TEST_F(NavigatorTestWithBrowserSideNavigation, NoContent) { |
| 157 const GURL kUrl1("http://www.chromium.org/"); | 222 const GURL kUrl1("http://www.chromium.org/"); |
| 158 const GURL kUrl2("http://www.google.com/"); | 223 const GURL kUrl2("http://www.google.com/"); |
| 159 | 224 |
| 160 // Load a URL. | 225 // Load a URL. |
| 161 contents()->NavigateAndCommit(kUrl1); | 226 contents()->NavigateAndCommit(kUrl1); |
| 162 RenderFrameHostImpl* rfh = main_test_rfh(); | |
| 163 EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, rfh->rfh_state()); | |
| 164 FrameTreeNode* node = main_test_rfh()->frame_tree_node(); | 227 FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
| 228 RenderFrameHostManager* rfhm = node->render_manager(); | |
| 165 | 229 |
| 166 // Navigate to a different site. | 230 // Navigate to a different site. |
| 167 SendRequestNavigation(node, kUrl2); | 231 SendRequestNavigation(node, kUrl2); |
| 168 main_test_rfh()->SendBeginNavigationWithURL(kUrl2); | 232 main_test_rfh()->SendBeginNavigationWithURL(kUrl2); |
| 169 NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); | 233 NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); |
| 170 ASSERT_TRUE(main_request); | 234 ASSERT_TRUE(main_request); |
| 171 | 235 |
| 236 // Navigations to a different site do create a speculative RenderFrameHost. | |
| 237 EXPECT_TRUE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 238 | |
| 172 // Commit an HTTP 204 response. | 239 // Commit an HTTP 204 response. |
| 173 scoped_refptr<ResourceResponse> response(new ResourceResponse); | 240 scoped_refptr<ResourceResponse> response(new ResourceResponse); |
| 174 const char kNoContentHeaders[] = "HTTP/1.1 204 No Content\0\0"; | 241 const char kNoContentHeaders[] = "HTTP/1.1 204 No Content\0\0"; |
| 175 response->head.headers = new net::HttpResponseHeaders( | 242 response->head.headers = new net::HttpResponseHeaders( |
| 176 std::string(kNoContentHeaders, arraysize(kNoContentHeaders))); | 243 std::string(kNoContentHeaders, arraysize(kNoContentHeaders))); |
| 177 GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted( | 244 GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted( |
| 178 response, MakeEmptyStream()); | 245 response, MakeEmptyStream()); |
| 179 | 246 |
| 180 // There should be no pending RenderFrameHost; the navigation was aborted. | 247 // There should be no pending nor speculative RenderFrameHost; the navigation |
| 248 // was aborted. | |
| 181 EXPECT_FALSE(GetNavigationRequestForFrameTreeNode(node)); | 249 EXPECT_FALSE(GetNavigationRequestForFrameTreeNode(node)); |
| 182 EXPECT_FALSE(node->render_manager()->pending_frame_host()); | 250 EXPECT_FALSE(rfhm->pending_frame_host()); |
| 251 EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 183 | 252 |
| 184 // Now, repeat the test with 205 Reset Content. | 253 // Now, repeat the test with 205 Reset Content. |
| 185 | 254 |
| 186 // Navigate to a different site again. | 255 // Navigate to a different site again. |
| 187 SendRequestNavigation(node, kUrl2); | 256 SendRequestNavigation(node, kUrl2); |
| 188 main_test_rfh()->SendBeginNavigationWithURL(kUrl2); | 257 main_test_rfh()->SendBeginNavigationWithURL(kUrl2); |
| 189 main_request = GetNavigationRequestForFrameTreeNode(node); | 258 main_request = GetNavigationRequestForFrameTreeNode(node); |
| 190 ASSERT_TRUE(main_request); | 259 ASSERT_TRUE(main_request); |
| 260 EXPECT_TRUE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 191 | 261 |
| 192 // Commit an HTTP 205 response. | 262 // Commit an HTTP 205 response. |
| 193 response = new ResourceResponse; | 263 response = new ResourceResponse; |
| 194 const char kResetContentHeaders[] = "HTTP/1.1 205 Reset Content\0\0"; | 264 const char kResetContentHeaders[] = "HTTP/1.1 205 Reset Content\0\0"; |
| 195 response->head.headers = new net::HttpResponseHeaders( | 265 response->head.headers = new net::HttpResponseHeaders( |
| 196 std::string(kResetContentHeaders, arraysize(kResetContentHeaders))); | 266 std::string(kResetContentHeaders, arraysize(kResetContentHeaders))); |
| 197 GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted( | 267 GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted( |
| 198 response, MakeEmptyStream()); | 268 response, MakeEmptyStream()); |
| 199 | 269 |
| 200 // There should be no pending RenderFrameHost; the navigation was aborted. | 270 // There should be no pending nor speculative RenderFrameHost; the navigation |
| 271 // was aborted. | |
| 201 EXPECT_FALSE(GetNavigationRequestForFrameTreeNode(node)); | 272 EXPECT_FALSE(GetNavigationRequestForFrameTreeNode(node)); |
| 202 EXPECT_FALSE(node->render_manager()->pending_frame_host()); | 273 EXPECT_FALSE(rfhm->pending_frame_host()); |
| 274 EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 203 } | 275 } |
| 204 | 276 |
| 205 // PlzNavigate: Test that a new RenderFrameHost is created when doing a cross | 277 // PlzNavigate: Test that a new RenderFrameHost is created when doing a cross |
| 206 // site navigation. | 278 // site navigation. |
| 207 TEST_F(NavigatorTestWithBrowserSideNavigation, CrossSiteNavigation) { | 279 TEST_F(NavigatorTestWithBrowserSideNavigation, CrossSiteNavigation) { |
| 208 const GURL kUrl1("http://www.chromium.org/"); | 280 const GURL kUrl1("http://www.chromium.org/"); |
| 209 const GURL kUrl2("http://www.google.com/"); | 281 const GURL kUrl2("http://www.google.com/"); |
| 210 | 282 |
| 211 contents()->NavigateAndCommit(kUrl1); | 283 contents()->NavigateAndCommit(kUrl1); |
| 212 RenderFrameHostImpl* rfh = main_test_rfh(); | 284 RenderFrameHostImpl* rfh = main_test_rfh(); |
| 213 EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, rfh->rfh_state()); | |
| 214 FrameTreeNode* node = main_test_rfh()->frame_tree_node(); | 285 FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
| 286 RenderFrameHostManager* rfhm = node->render_manager(); | |
| 215 | 287 |
| 216 // Navigate to a different site. | 288 // Navigate to a different site. |
| 217 SendRequestNavigation(node, kUrl2); | 289 SendRequestNavigation(node, kUrl2); |
| 218 main_test_rfh()->SendBeginNavigationWithURL(kUrl2); | 290 main_test_rfh()->SendBeginNavigationWithURL(kUrl2); |
| 219 NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); | 291 NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); |
| 220 ASSERT_TRUE(main_request); | 292 ASSERT_TRUE(main_request); |
| 293 EXPECT_TRUE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 221 | 294 |
| 222 scoped_refptr<ResourceResponse> response(new ResourceResponse); | 295 scoped_refptr<ResourceResponse> response(new ResourceResponse); |
| 223 GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted( | 296 GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted( |
| 224 response, MakeEmptyStream()); | 297 response, MakeEmptyStream()); |
| 225 RenderFrameHostImpl* pending_rfh = | 298 EXPECT_TRUE(GetSpeculativeRenderFrameHost(rfhm)); |
| 226 node->render_manager()->pending_frame_host(); | 299 |
| 227 ASSERT_TRUE(pending_rfh); | 300 FrameHostMsg_DidCommitProvisionalLoad_Params params = |
| 228 EXPECT_NE(pending_rfh, rfh); | 301 BuildSimpleDCPLParams(kUrl2); |
| 229 EXPECT_TRUE(pending_rfh->IsRenderFrameLive()); | 302 main_test_rfh()->SendNavigateWithParams(¶ms); |
|
clamy
2014/12/16 15:22:48
Switch to using TestRenderFrameHost::SendNavigate
carlosk
2014/12/19 04:27:14
Done.
clamy
2014/12/19 13:35:57
I really meant to use that precise function and no
carlosk
2014/12/29 16:40:16
OK. What was bugging me about that approach was th
| |
| 230 EXPECT_TRUE(pending_rfh->render_view_host()->IsRenderViewLive()); | 303 RenderFrameHostImpl* final_rfh = main_test_rfh(); |
| 304 ASSERT_TRUE(final_rfh); | |
| 305 EXPECT_NE(rfh, final_rfh); | |
| 306 EXPECT_TRUE(final_rfh->IsRenderFrameLive()); | |
| 307 EXPECT_TRUE(final_rfh->render_view_host()->IsRenderViewLive()); | |
| 308 EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 231 } | 309 } |
| 232 | 310 |
| 233 // PlzNavigate: Test that redirects are followed. | 311 // PlzNavigate: Test that redirects are followed and the speculative renderer |
| 312 // logic behaves as expected. | |
| 234 TEST_F(NavigatorTestWithBrowserSideNavigation, RedirectCrossSite) { | 313 TEST_F(NavigatorTestWithBrowserSideNavigation, RedirectCrossSite) { |
| 235 const GURL kUrl1("http://www.chromium.org/"); | 314 const GURL kUrl1("http://www.chromium.org/"); |
| 236 const GURL kUrl2("http://www.google.com/"); | 315 const GURL kUrl2("http://www.google.com/"); |
| 237 | 316 |
| 238 contents()->NavigateAndCommit(kUrl1); | 317 contents()->NavigateAndCommit(kUrl1); |
| 239 RenderFrameHostImpl* rfh = main_test_rfh(); | 318 RenderFrameHostImpl* rfh = main_test_rfh(); |
| 240 EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, rfh->rfh_state()); | |
| 241 FrameTreeNode* node = main_test_rfh()->frame_tree_node(); | 319 FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
| 320 RenderFrameHostManager* rfhm = node->render_manager(); | |
| 242 | 321 |
| 243 // Navigate to a URL on the same site. | 322 // Navigate to a URL on the same site. |
| 244 SendRequestNavigation(node, kUrl1); | 323 SendRequestNavigation(node, kUrl1); |
| 245 main_test_rfh()->SendBeginNavigationWithURL(kUrl1); | 324 main_test_rfh()->SendBeginNavigationWithURL(kUrl1); |
| 246 NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); | 325 NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); |
| 247 ASSERT_TRUE(main_request); | 326 ASSERT_TRUE(main_request); |
| 327 EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 248 | 328 |
| 249 // It then redirects to another site. | 329 // It then redirects to another site. |
| 250 net::RedirectInfo redirect_info; | 330 net::RedirectInfo redirect_info; |
| 251 redirect_info.status_code = 302; | 331 redirect_info.status_code = 302; |
| 252 redirect_info.new_method = "GET"; | 332 redirect_info.new_method = "GET"; |
| 253 redirect_info.new_url = kUrl2; | 333 redirect_info.new_url = kUrl2; |
| 254 redirect_info.new_first_party_for_cookies = kUrl2; | 334 redirect_info.new_first_party_for_cookies = kUrl2; |
| 255 scoped_refptr<ResourceResponse> response(new ResourceResponse); | 335 scoped_refptr<ResourceResponse> response(new ResourceResponse); |
| 256 GetLoaderForNavigationRequest(main_request)->CallOnRequestRedirected( | 336 GetLoaderForNavigationRequest(main_request)->CallOnRequestRedirected( |
| 257 redirect_info, response); | 337 redirect_info, response); |
| 258 | 338 |
| 259 // The redirect should have been followed. | 339 // The redirect should have been followed. |
| 260 EXPECT_EQ(1, GetLoaderForNavigationRequest(main_request)->redirect_count()); | 340 EXPECT_EQ(1, GetLoaderForNavigationRequest(main_request)->redirect_count()); |
| 341 EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 261 | 342 |
| 262 // Then it commits. | 343 // Then it commits. |
| 263 response = new ResourceResponse; | 344 response = new ResourceResponse; |
| 264 GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted( | 345 GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted( |
| 265 response, MakeEmptyStream()); | 346 response, MakeEmptyStream()); |
| 266 RenderFrameHostImpl* pending_rfh = | 347 RenderFrameHost* final_srfh = GetSpeculativeRenderFrameHost(rfhm); |
| 267 node->render_manager()->pending_frame_host(); | 348 EXPECT_TRUE(final_srfh); |
| 268 ASSERT_TRUE(pending_rfh); | 349 |
| 269 EXPECT_NE(pending_rfh, rfh); | 350 // And commits provisional load. |
| 270 EXPECT_TRUE(pending_rfh->IsRenderFrameLive()); | 351 FrameHostMsg_DidCommitProvisionalLoad_Params params = |
| 271 EXPECT_TRUE(pending_rfh->render_view_host()->IsRenderViewLive()); | 352 BuildSimpleDCPLParams(kUrl2); |
| 353 main_test_rfh()->SendNavigateWithParams(¶ms); | |
| 354 RenderFrameHostImpl* final_rfh = main_test_rfh(); | |
| 355 ASSERT_TRUE(final_rfh); | |
| 356 EXPECT_NE(rfh, final_rfh); | |
| 357 EXPECT_EQ(final_srfh, final_rfh); | |
|
clamy
2014/12/16 15:22:48
nit: could you rename one of those parameters? fin
carlosk
2014/12/19 04:27:14
Done.
| |
| 358 EXPECT_TRUE(final_rfh->IsRenderFrameLive()); | |
| 359 EXPECT_TRUE(final_rfh->render_view_host()->IsRenderViewLive()); | |
| 360 EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 272 } | 361 } |
| 273 | 362 |
| 274 // PlzNavigate: Test that a navigation is cancelled if another request has been | 363 // PlzNavigate: Test that a navigation is canceled if another request has been |
| 275 // issued in the meantime. | 364 // issued in the meantime. Also confirms that the speculative renderer is |
| 365 // correctly updated in the process. | |
| 276 TEST_F(NavigatorTestWithBrowserSideNavigation, ReplacePendingNavigation) { | 366 TEST_F(NavigatorTestWithBrowserSideNavigation, ReplacePendingNavigation) { |
| 277 const GURL kUrl0("http://www.wikipedia.org/"); | 367 const GURL kUrl0("http://www.wikipedia.org/"); |
| 278 const GURL kUrl0_site = SiteInstance::GetSiteForURL(browser_context(), kUrl0); | |
| 279 const GURL kUrl1("http://www.chromium.org/"); | 368 const GURL kUrl1("http://www.chromium.org/"); |
| 369 const GURL kUrl1_site = SiteInstance::GetSiteForURL(browser_context(), kUrl1); | |
| 280 const GURL kUrl2("http://www.google.com/"); | 370 const GURL kUrl2("http://www.google.com/"); |
| 281 const GURL kUrl2_site = SiteInstance::GetSiteForURL(browser_context(), kUrl2); | 371 const GURL kUrl2_site = SiteInstance::GetSiteForURL(browser_context(), kUrl2); |
| 282 | 372 |
| 283 // Initialization. | 373 // Initialization. |
| 284 contents()->NavigateAndCommit(kUrl0); | 374 contents()->NavigateAndCommit(kUrl0); |
| 285 FrameTreeNode* node = main_test_rfh()->frame_tree_node(); | 375 FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
| 286 EXPECT_EQ(kUrl0_site, main_test_rfh()->GetSiteInstance()->GetSiteURL()); | 376 RenderFrameHostManager* rfhm = node->render_manager(); |
| 287 | 377 |
| 288 // Request navigation to the 1st URL. | 378 // Request navigation to the 1st URL. |
| 289 SendRequestNavigation(node, kUrl1); | 379 SendRequestNavigation(node, kUrl1); |
| 290 main_test_rfh()->SendBeginNavigationWithURL(kUrl1); | 380 main_test_rfh()->SendBeginNavigationWithURL(kUrl1); |
| 291 NavigationRequest* request1 = GetNavigationRequestForFrameTreeNode(node); | 381 NavigationRequest* request1 = GetNavigationRequestForFrameTreeNode(node); |
| 292 ASSERT_TRUE(request1); | 382 ASSERT_TRUE(request1); |
| 293 EXPECT_EQ(kUrl1, request1->common_params().url); | 383 EXPECT_EQ(kUrl1, request1->common_params().url); |
| 294 base::WeakPtr<TestNavigationURLLoader> loader1 = | 384 base::WeakPtr<TestNavigationURLLoader> loader1 = |
| 295 GetLoaderForNavigationRequest(request1)->AsWeakPtr(); | 385 GetLoaderForNavigationRequest(request1)->AsWeakPtr(); |
| 296 | 386 |
| 387 // Confirm a speculative RFH was created. | |
| 388 ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 389 int32 site_instance_id_1 = | |
| 390 GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId(); | |
| 391 EXPECT_EQ( | |
| 392 kUrl1_site, | |
| 393 GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetSiteURL()); | |
| 394 | |
| 297 // Request navigation to the 2nd URL; the NavigationRequest must have been | 395 // Request navigation to the 2nd URL; the NavigationRequest must have been |
| 298 // replaced by a new one with a different URL. | 396 // replaced by a new one with a different URL. |
| 299 SendRequestNavigation(node, kUrl2); | 397 SendRequestNavigation(node, kUrl2); |
| 300 main_test_rfh()->SendBeginNavigationWithURL(kUrl2); | 398 main_test_rfh()->SendBeginNavigationWithURL(kUrl2); |
| 301 NavigationRequest* request2 = GetNavigationRequestForFrameTreeNode(node); | 399 NavigationRequest* request2 = GetNavigationRequestForFrameTreeNode(node); |
| 302 ASSERT_TRUE(request2); | 400 ASSERT_TRUE(request2); |
| 303 EXPECT_EQ(kUrl2, request2->common_params().url); | 401 EXPECT_EQ(kUrl2, request2->common_params().url); |
| 304 | 402 |
| 305 // Confirm that the first loader got destroyed. | 403 // Confirm that the first loader got destroyed. |
| 306 EXPECT_FALSE(loader1); | 404 EXPECT_FALSE(loader1); |
| 307 | 405 |
| 308 // Confirm that the commit corresponds to the new request. | 406 // Confirm that a new speculative RFH was created. |
| 407 ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 408 int32 site_instance_id_2 = | |
| 409 GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId(); | |
| 410 EXPECT_NE(site_instance_id_1, site_instance_id_2); | |
| 411 | |
| 412 // Commit. | |
| 309 scoped_refptr<ResourceResponse> response(new ResourceResponse); | 413 scoped_refptr<ResourceResponse> response(new ResourceResponse); |
| 310 GetLoaderForNavigationRequest(request2)->CallOnResponseStarted( | 414 GetLoaderForNavigationRequest(request2)->CallOnResponseStarted( |
| 311 response, MakeEmptyStream()); | 415 response, MakeEmptyStream()); |
| 312 RenderFrameHostImpl* pending_rfh = | 416 |
| 313 node->render_manager()->pending_frame_host(); | 417 // And commit provisional load. |
| 314 ASSERT_TRUE(pending_rfh); | 418 FrameHostMsg_DidCommitProvisionalLoad_Params params = |
| 315 EXPECT_EQ(kUrl2_site, pending_rfh->GetSiteInstance()->GetSiteURL()); | 419 BuildSimpleDCPLParams(kUrl2); |
| 420 main_test_rfh()->SendNavigateWithParams(¶ms); | |
| 421 | |
| 422 // Confirm that the commit corresponds to the new request. | |
| 423 ASSERT_TRUE(main_test_rfh()); | |
| 424 EXPECT_EQ(kUrl2_site, main_test_rfh()->GetSiteInstance()->GetSiteURL()); | |
| 425 | |
| 426 // Confirm that the committed RFH is the new speculative one. | |
| 427 EXPECT_EQ(site_instance_id_2, main_test_rfh()->GetSiteInstance()->GetId()); | |
| 316 } | 428 } |
| 317 | 429 |
| 318 // PlzNavigate: Test that a reload navigation is properly signaled to the | 430 // PlzNavigate: Test that a reload navigation is properly signaled to the |
| 319 // renderer when the navigation can commit. | 431 // renderer when the navigation can commit. Speculative renderers should not be |
| 432 // created at any step. | |
| 320 TEST_F(NavigatorTestWithBrowserSideNavigation, Reload) { | 433 TEST_F(NavigatorTestWithBrowserSideNavigation, Reload) { |
| 321 const GURL kUrl("http://www.google.com/"); | 434 const GURL kUrl("http://www.google.com/"); |
| 322 contents()->NavigateAndCommit(kUrl); | 435 contents()->NavigateAndCommit(kUrl); |
| 323 | 436 |
| 324 FrameTreeNode* node = main_test_rfh()->frame_tree_node(); | 437 FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
| 438 RenderFrameHostManager* rfhm = node->render_manager(); | |
| 325 SendRequestNavigationWithParameters( | 439 SendRequestNavigationWithParameters( |
| 326 node, kUrl, Referrer(), ui::PAGE_TRANSITION_LINK, | 440 node, kUrl, Referrer(), ui::PAGE_TRANSITION_LINK, |
| 327 NavigationController::RELOAD); | 441 NavigationController::RELOAD); |
| 328 contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl); | 442 contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl); |
| 329 // A NavigationRequest should have been generated. | 443 // A NavigationRequest should have been generated. |
| 330 NavigationRequest* main_request = | 444 NavigationRequest* main_request = |
| 331 GetNavigationRequestForFrameTreeNode(node); | 445 GetNavigationRequestForFrameTreeNode(node); |
| 332 ASSERT_TRUE(main_request != NULL); | 446 ASSERT_TRUE(main_request != NULL); |
| 333 EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD, | 447 EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD, |
| 334 main_request->common_params().navigation_type); | 448 main_request->common_params().navigation_type); |
| 449 EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 450 | |
| 335 int page_id = contents()->GetMaxPageIDForSiteInstance( | 451 int page_id = contents()->GetMaxPageIDForSiteInstance( |
| 336 main_test_rfh()->GetSiteInstance()) + 1; | 452 main_test_rfh()->GetSiteInstance()) + 1; |
| 337 main_test_rfh()->SendNavigate(page_id, kUrl); | 453 main_test_rfh()->SendNavigate(page_id, kUrl); |
| 454 EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 338 | 455 |
| 339 // Now do a shift+reload. | 456 // Now do a shift+reload. |
| 340 SendRequestNavigationWithParameters( | 457 SendRequestNavigationWithParameters( |
| 341 node, kUrl, Referrer(), ui::PAGE_TRANSITION_LINK, | 458 node, kUrl, Referrer(), ui::PAGE_TRANSITION_LINK, |
| 342 NavigationController::RELOAD_IGNORING_CACHE); | 459 NavigationController::RELOAD_IGNORING_CACHE); |
| 343 contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl); | 460 contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl); |
| 344 // A NavigationRequest should have been generated. | 461 // A NavigationRequest should have been generated. |
| 345 main_request = GetNavigationRequestForFrameTreeNode(node); | 462 main_request = GetNavigationRequestForFrameTreeNode(node); |
| 346 ASSERT_TRUE(main_request != NULL); | 463 ASSERT_TRUE(main_request != NULL); |
| 347 EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD_IGNORING_CACHE, | 464 EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD_IGNORING_CACHE, |
| 348 main_request->common_params().navigation_type); | 465 main_request->common_params().navigation_type); |
| 466 EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 467 } | |
| 468 | |
| 469 // PlzNavigate: Confirm that a speculative RenderFrameHost is used when | |
| 470 // navigating from one site to the another. | |
| 471 TEST_F(NavigatorTestWithBrowserSideNavigation, | |
| 472 SpeculativeRendererWorksBaseCase) { | |
| 473 // Navigate to an initial site. | |
| 474 const GURL kUrlInit("http://wikipedia.org/"); | |
| 475 contents()->NavigateAndCommit(kUrlInit); | |
| 476 FrameTreeNode* node = main_test_rfh()->frame_tree_node(); | |
| 477 RenderFrameHostManager* rfhm = node->render_manager(); | |
| 478 | |
| 479 // Begin navigating to another site. | |
| 480 const GURL kUrl("http://google.com/"); | |
| 481 SendRequestNavigation(node, kUrl); | |
| 482 contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl); | |
| 483 ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 484 EXPECT_NE(GetSpeculativeRenderFrameHost(rfhm), main_test_rfh()); | |
| 485 EXPECT_EQ( | |
| 486 SiteInstanceImpl::GetSiteForURL(browser_context(), kUrl), | |
| 487 GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetSiteURL()); | |
| 488 EXPECT_FALSE(rfhm->pending_frame_host()); | |
| 489 int32 site_instance_id = | |
| 490 GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId(); | |
| 491 | |
| 492 // Ask Navigator to commit the navigation by simulating a call to | |
| 493 // OnResponseStarted. | |
| 494 scoped_refptr<ResourceResponse> response(new ResourceResponse); | |
| 495 GetLoaderForNavigationRequest(GetNavigationRequestForFrameTreeNode(node)) | |
| 496 ->CallOnResponseStarted(response, MakeEmptyStream()); | |
| 497 ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 498 EXPECT_EQ(site_instance_id, | |
| 499 GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId()); | |
| 500 EXPECT_FALSE(rfhm->pending_frame_host()); | |
| 501 | |
| 502 // Invoke OnDidCommitProvisionalLoad. | |
| 503 FrameHostMsg_DidCommitProvisionalLoad_Params params = | |
| 504 BuildSimpleDCPLParams(kUrl); | |
| 505 main_test_rfh()->SendNavigateWithParams(¶ms); | |
| 506 EXPECT_EQ(site_instance_id, main_test_rfh()->GetSiteInstance()->GetId()); | |
| 507 EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 508 EXPECT_FALSE(rfhm->pending_frame_host()); | |
| 509 } | |
| 510 | |
| 511 // PlzNavigate: Confirm that a speculative RenderFrameHost is thrown away when | |
| 512 // the final URL's site differs from the initial one due to redirects. | |
| 513 TEST_F(NavigatorTestWithBrowserSideNavigation, | |
| 514 SpeculativeRendererDiscardedAfterRedirectToAnotherSite) { | |
| 515 // Navigate to an initial site. | |
| 516 const GURL kUrlInit("http://wikipedia.org/"); | |
| 517 contents()->NavigateAndCommit(kUrlInit); | |
| 518 FrameTreeNode* node = main_test_rfh()->frame_tree_node(); | |
| 519 RenderFrameHostManager* rfhm = node->render_manager(); | |
| 520 int32 init_site_instance_id = main_test_rfh()->GetSiteInstance()->GetId(); | |
| 521 | |
| 522 // Begin navigating to another site. | |
| 523 const GURL kUrl("http://google.com/"); | |
| 524 SendRequestNavigation(node, kUrl); | |
| 525 contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl); | |
| 526 int32 site_instance_id = | |
| 527 GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId(); | |
| 528 EXPECT_EQ(init_site_instance_id, main_test_rfh()->GetSiteInstance()->GetId()); | |
| 529 ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 530 EXPECT_NE(GetSpeculativeRenderFrameHost(rfhm), main_test_rfh()); | |
| 531 EXPECT_EQ( | |
| 532 SiteInstanceImpl::GetSiteForURL(browser_context(), kUrl), | |
| 533 GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetSiteURL()); | |
| 534 | |
| 535 // It then redirects to yet another site. | |
| 536 NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); | |
| 537 ASSERT_TRUE(main_request); | |
| 538 const GURL kUrlRedirect("https://www.google.com/"); | |
| 539 net::RedirectInfo redirect_info; | |
| 540 redirect_info.status_code = 302; | |
| 541 redirect_info.new_method = "GET"; | |
| 542 redirect_info.new_url = kUrlRedirect; | |
| 543 redirect_info.new_first_party_for_cookies = kUrlRedirect; | |
| 544 scoped_refptr<ResourceResponse> response(new ResourceResponse); | |
| 545 GetLoaderForNavigationRequest(main_request) | |
| 546 ->CallOnRequestRedirected(redirect_info, response); | |
| 547 EXPECT_EQ(init_site_instance_id, main_test_rfh()->GetSiteInstance()->GetId()); | |
| 548 ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 549 | |
| 550 // TODO(carlosk): once the speculative RenderFrameHost updates with redirects | |
| 551 // this next check will be changed to verify that it actually happens. | |
| 552 EXPECT_EQ(site_instance_id, | |
| 553 GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId()); | |
| 554 | |
| 555 // Commit the navigation with Navigator by simulating the call to | |
| 556 // OnResponseStarted. | |
| 557 response = new ResourceResponse; | |
| 558 GetLoaderForNavigationRequest(main_request) | |
| 559 ->CallOnResponseStarted(response, MakeEmptyStream()); | |
| 560 EXPECT_EQ(init_site_instance_id, main_test_rfh()->GetSiteInstance()->GetId()); | |
| 561 | |
| 562 // Once commit happens the speculative RenderFrameHost is already updated to | |
| 563 // match the known final SiteInstance. | |
| 564 ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 565 EXPECT_EQ( | |
| 566 SiteInstanceImpl::GetSiteForURL(browser_context(), kUrlRedirect), | |
| 567 GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetSiteURL()); | |
| 568 int32 redirect_site_instance_id = | |
| 569 GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId(); | |
| 570 | |
| 571 // Invoke OnDidCommitProvisionalLoad. | |
| 572 FrameHostMsg_DidCommitProvisionalLoad_Params params = | |
| 573 BuildSimpleDCPLParams(kUrl); | |
| 574 main_test_rfh()->SendNavigateWithParams(¶ms); | |
| 575 | |
| 576 // And finally on commit-provisional-load the already created RenderFrameHost | |
| 577 // is made active. | |
| 578 EXPECT_EQ(redirect_site_instance_id, | |
| 579 main_test_rfh()->GetSiteInstance()->GetId()); | |
| 580 EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); | |
| 581 } | |
| 582 | |
| 583 // PlzNavigate: Verify that a previously swapped-out RenderFrameHost is | |
| 584 // correctly reused when spawning a speculative RenderFrameHost in a navigation | |
| 585 // using the same SiteInstance. | |
| 586 TEST_F(NavigatorTestWithBrowserSideNavigation, | |
| 587 SpeculativeRendererReuseSwappedOutRFH) { | |
| 588 // Navigate to an initial site. | |
| 589 const GURL kUrl1("http://wikipedia.org/"); | |
| 590 contents()->NavigateAndCommit(kUrl1); | |
| 591 RenderFrameHostImpl* rfh1 = main_test_rfh(); | |
| 592 RenderFrameHostManager* rfhm = rfh1->frame_tree_node()->render_manager(); | |
| 593 | |
| 594 // Increment active frame count to cause the RenderFrameHost to be swapped out | |
| 595 // (instead of immediately destroyed). | |
| 596 rfh1->GetSiteInstance()->increment_active_frame_count(); | |
| 597 | |
| 598 // Then to another to swap-out the initial RenderFrameHost. | |
|
clamy
2014/12/16 15:22:48
s/Then to another/Navigate to another site
carlosk
2014/12/19 04:27:14
Done.
| |
| 599 const GURL kUrl2("http://chromium.org/"); | |
| 600 contents()->NavigateAndCommit(kUrl2); | |
| 601 ASSERT_NE(rfh1, main_test_rfh()); | |
| 602 EXPECT_NE(RenderFrameHostImpl::STATE_DEFAULT, rfh1->rfh_state()); | |
| 603 EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, main_test_rfh()->rfh_state()); | |
| 604 EXPECT_TRUE(rfhm->IsOnSwappedOutList(rfh1)); | |
| 605 | |
| 606 // Now goes back to the initial site. | |
|
clamy
2014/12/16 15:22:48
s/goes/go
I would add a comment along the lines o
carlosk
2014/12/19 04:27:14
Done.
| |
| 607 contents()->NavigateAndCommit(kUrl1); | |
|
clamy
2014/12/16 15:22:48
I think you could actually split the NavigateAndCo
carlosk
2014/12/19 04:27:14
Done.
| |
| 608 EXPECT_EQ(rfh1, main_test_rfh()); | |
| 609 EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, rfh1->rfh_state()); | |
| 610 EXPECT_FALSE(rfhm->IsOnSwappedOutList(rfh1)); | |
| 349 } | 611 } |
| 350 | 612 |
| 351 } // namespace content | 613 } // namespace content |
| OLD | NEW |