| 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 "content/browser/frame_host/navigation_controller_impl.h" | 5 #include "content/browser/frame_host/navigation_controller_impl.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 4172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4183 // TODO(creis): This actually goes to frame_url_2 in some cases when subframe | 4183 // TODO(creis): This actually goes to frame_url_2 in some cases when subframe |
| 4184 // FrameNavigationEntries are enabled, due to a mismatch between PageState and | 4184 // FrameNavigationEntries are enabled, due to a mismatch between PageState and |
| 4185 // the entry's URL. That should be fixed in https://crbug.com/617239. | 4185 // the entry's URL. That should be fixed in https://crbug.com/617239. |
| 4186 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) | 4186 if (!SiteIsolationPolicy::AreCrossProcessFramesPossible()) |
| 4187 EXPECT_EQ(frame_url_1, frame->current_url()); | 4187 EXPECT_EQ(frame_url_1, frame->current_url()); |
| 4188 } | 4188 } |
| 4189 | 4189 |
| 4190 // Test for in-page navigation kills due to using the wrong history item in | 4190 // Test for in-page navigation kills due to using the wrong history item in |
| 4191 // HistoryController::RecursiveGoToEntry and NavigationControllerImpl:: | 4191 // HistoryController::RecursiveGoToEntry and NavigationControllerImpl:: |
| 4192 // FindFramesToNavigate. See https://crbug.com/612713. | 4192 // FindFramesToNavigate. See https://crbug.com/612713. |
| 4193 // |
| 4194 // TODO(creis): Enable this test when https://crbug.com/618100 is fixed. |
| 4195 // Disabled for now while we switch to the new navigation path, since this kill |
| 4196 // is exceptionally rare in practice. |
| 4193 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, | 4197 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, |
| 4194 BackTwiceToIframeWithContent) { | 4198 DISABLED_BackTwiceToIframeWithContent) { |
| 4195 GURL links_url(embedded_test_server()->GetURL( | 4199 GURL links_url(embedded_test_server()->GetURL( |
| 4196 "/navigation_controller/page_with_links.html")); | 4200 "/navigation_controller/page_with_links.html")); |
| 4197 NavigateToURL(shell(), links_url); | 4201 NavigateToURL(shell(), links_url); |
| 4198 EXPECT_TRUE(WaitForLoadStop(shell()->web_contents())); | 4202 EXPECT_TRUE(WaitForLoadStop(shell()->web_contents())); |
| 4199 | 4203 |
| 4200 NavigationController& controller = shell()->web_contents()->GetController(); | 4204 NavigationController& controller = shell()->web_contents()->GetController(); |
| 4201 FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents()) | 4205 FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents()) |
| 4202 ->GetFrameTree() | 4206 ->GetFrameTree() |
| 4203 ->root(); | 4207 ->root(); |
| 4204 | 4208 |
| (...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4682 std::string body; | 4686 std::string body; |
| 4683 EXPECT_TRUE(ExecuteScriptAndExtractString( | 4687 EXPECT_TRUE(ExecuteScriptAndExtractString( |
| 4684 shell()->web_contents(), | 4688 shell()->web_contents(), |
| 4685 "window.domAutomationController.send(" | 4689 "window.domAutomationController.send(" |
| 4686 "document.getElementsByTagName('pre')[0].innerText);", | 4690 "document.getElementsByTagName('pre')[0].innerText);", |
| 4687 &body)); | 4691 &body)); |
| 4688 EXPECT_EQ("text=value\n", body); | 4692 EXPECT_EQ("text=value\n", body); |
| 4689 } | 4693 } |
| 4690 | 4694 |
| 4691 } // namespace content | 4695 } // namespace content |
| OLD | NEW |