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 <algorithm> | 8 #include <algorithm> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 1318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1329 "/navigation_controller/simple_page_1.html")); | 1329 "/navigation_controller/simple_page_1.html")); |
1330 NavigateFrameToURL(root, frame_url); | 1330 NavigateFrameToURL(root, frame_url); |
1331 capturer.Wait(); | 1331 capturer.Wait(); |
1332 EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs( | 1332 EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs( |
1333 capturer.params().transition, ui::PAGE_TRANSITION_LINK)); | 1333 capturer.params().transition, ui::PAGE_TRANSITION_LINK)); |
1334 EXPECT_EQ(NAVIGATION_TYPE_SAME_PAGE, capturer.details().type); | 1334 EXPECT_EQ(NAVIGATION_TYPE_SAME_PAGE, capturer.details().type); |
1335 } | 1335 } |
1336 } | 1336 } |
1337 | 1337 |
1338 // Verify that reloading a page with url anchor scrolls to correct position. | 1338 // Verify that reloading a page with url anchor scrolls to correct position. |
1339 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, ReloadWithUrlAnchor) { | 1339 // Disabled due to flakiness: https://crbug.com/672545. |
| 1340 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, |
| 1341 DISABLED_ReloadWithUrlAnchor) { |
1340 GURL url1(embedded_test_server()->GetURL( | 1342 GURL url1(embedded_test_server()->GetURL( |
1341 "/navigation_controller/reload-with-url-anchor.html#d2")); | 1343 "/navigation_controller/reload-with-url-anchor.html#d2")); |
1342 EXPECT_TRUE(NavigateToURL(shell(), url1)); | 1344 EXPECT_TRUE(NavigateToURL(shell(), url1)); |
1343 | 1345 |
1344 std::string script = | 1346 std::string script = |
1345 "domAutomationController.send(document.getElementById('div').scrollTop)"; | 1347 "domAutomationController.send(document.getElementById('div').scrollTop)"; |
1346 int value = 0; | 1348 int value = 0; |
1347 EXPECT_TRUE(ExecuteScriptAndExtractInt(shell(), script, &value)); | 1349 EXPECT_TRUE(ExecuteScriptAndExtractInt(shell(), script, &value)); |
1348 EXPECT_EQ(100, value); | 1350 EXPECT_EQ(100, value); |
1349 | 1351 |
(...skipping 5680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
7030 NavigationHandleCommitObserver handle_observer(shell()->web_contents(), | 7032 NavigationHandleCommitObserver handle_observer(shell()->web_contents(), |
7031 kFragmentURL); | 7033 kFragmentURL); |
7032 EXPECT_TRUE(NavigateToURL(shell(), kFragmentURL)); | 7034 EXPECT_TRUE(NavigateToURL(shell(), kFragmentURL)); |
7033 | 7035 |
7034 EXPECT_TRUE(handle_observer.has_committed()); | 7036 EXPECT_TRUE(handle_observer.has_committed()); |
7035 EXPECT_TRUE(handle_observer.was_same_page()); | 7037 EXPECT_TRUE(handle_observer.was_same_page()); |
7036 EXPECT_FALSE(handle_observer.was_renderer_initiated()); | 7038 EXPECT_FALSE(handle_observer.was_renderer_initiated()); |
7037 } | 7039 } |
7038 | 7040 |
7039 } // namespace content | 7041 } // namespace content |
OLD | NEW |