| 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 1620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1631 } | 1631 } |
| 1632 | 1632 |
| 1633 // TODO(creis): Check subframe entries once we create them in this case. | 1633 // TODO(creis): Check subframe entries once we create them in this case. |
| 1634 // See https://crbug.com/608402. | 1634 // See https://crbug.com/608402. |
| 1635 EXPECT_EQ(foo_url, root->child_at(0)->child_at(0)->current_url()); | 1635 EXPECT_EQ(foo_url, root->child_at(0)->child_at(0)->current_url()); |
| 1636 } | 1636 } |
| 1637 | 1637 |
| 1638 // Verify the tree of FrameNavigationEntries when a nested iframe commits inside | 1638 // Verify the tree of FrameNavigationEntries when a nested iframe commits inside |
| 1639 // the initial blank page of an iframe with no committed entry. Prevents | 1639 // the initial blank page of an iframe with no committed entry. Prevents |
| 1640 // regression of https://crbug.com/600743. | 1640 // regression of https://crbug.com/600743. |
| 1641 // Flaky test: See https://crbug.com/610801 |
| 1641 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, | 1642 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, |
| 1642 FrameNavigationEntry_NoCommitNestedAutoSubframe) { | 1643 DISABLED_FrameNavigationEntry_NoCommitNestedAutoSubframe)
{ |
| 1643 GURL main_url(embedded_test_server()->GetURL( | 1644 GURL main_url(embedded_test_server()->GetURL( |
| 1644 "/navigation_controller/simple_page_1.html")); | 1645 "/navigation_controller/simple_page_1.html")); |
| 1645 EXPECT_TRUE(NavigateToURL(shell(), main_url)); | 1646 EXPECT_TRUE(NavigateToURL(shell(), main_url)); |
| 1646 FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents()) | 1647 FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents()) |
| 1647 ->GetFrameTree() | 1648 ->GetFrameTree() |
| 1648 ->root(); | 1649 ->root(); |
| 1649 | 1650 |
| 1650 // 1. Create a iframe with a URL that doesn't commit. | 1651 // 1. Create a iframe with a URL that doesn't commit. |
| 1651 GURL no_commit_url(embedded_test_server()->GetURL("/nocontent")); | 1652 GURL no_commit_url(embedded_test_server()->GetURL("/nocontent")); |
| 1652 { | 1653 { |
| (...skipping 2434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4087 // TODO(clamy): Check the post id as well when PlzNavigate handles it | 4088 // TODO(clamy): Check the post id as well when PlzNavigate handles it |
| 4088 // properly. | 4089 // properly. |
| 4089 if (!IsBrowserSideNavigationEnabled()) | 4090 if (!IsBrowserSideNavigationEnabled()) |
| 4090 EXPECT_NE(-1, frame_entry->post_id()); | 4091 EXPECT_NE(-1, frame_entry->post_id()); |
| 4091 EXPECT_FALSE(entry->GetHasPostData()); | 4092 EXPECT_FALSE(entry->GetHasPostData()); |
| 4092 EXPECT_EQ(-1, entry->GetPostID()); | 4093 EXPECT_EQ(-1, entry->GetPostID()); |
| 4093 } | 4094 } |
| 4094 } | 4095 } |
| 4095 | 4096 |
| 4096 } // namespace content | 4097 } // namespace content |
| OLD | NEW |