| 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 3111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3122 // The id of the FrameTreeNode whose navigations to observe. | 3122 // The id of the FrameTreeNode whose navigations to observe. |
| 3123 int frame_tree_node_id_; | 3123 int frame_tree_node_id_; |
| 3124 | 3124 |
| 3125 // The MessageLoopRunner used to spin the message loop. | 3125 // The MessageLoopRunner used to spin the message loop. |
| 3126 scoped_refptr<MessageLoopRunner> message_loop_runner_; | 3126 scoped_refptr<MessageLoopRunner> message_loop_runner_; |
| 3127 }; | 3127 }; |
| 3128 | 3128 |
| 3129 } // namespace | 3129 } // namespace |
| 3130 | 3130 |
| 3131 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, | 3131 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, |
| 3132 StopCausesFailureDespiteJavaScriptURL) { | 3132 DISABLED_StopCausesFailureDespiteJavaScriptURL) { |
| 3133 NavigationControllerImpl& controller = | 3133 NavigationControllerImpl& controller = |
| 3134 static_cast<NavigationControllerImpl&>( | 3134 static_cast<NavigationControllerImpl&>( |
| 3135 shell()->web_contents()->GetController()); | 3135 shell()->web_contents()->GetController()); |
| 3136 | 3136 |
| 3137 FrameTreeNode* root = | 3137 FrameTreeNode* root = |
| 3138 static_cast<WebContentsImpl*>(shell()->web_contents())-> | 3138 static_cast<WebContentsImpl*>(shell()->web_contents())-> |
| 3139 GetFrameTree()->root(); | 3139 GetFrameTree()->root(); |
| 3140 | 3140 |
| 3141 // Start with a normal page. | 3141 // Start with a normal page. |
| 3142 GURL url1(embedded_test_server()->GetURL( | 3142 GURL url1(embedded_test_server()->GetURL( |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3401 observer.Wait(); | 3401 observer.Wait(); |
| 3402 | 3402 |
| 3403 EXPECT_EQ(3, controller.GetEntryCount()); | 3403 EXPECT_EQ(3, controller.GetEntryCount()); |
| 3404 EXPECT_EQ(3, RendererHistoryLength(shell())); | 3404 EXPECT_EQ(3, RendererHistoryLength(shell())); |
| 3405 EXPECT_EQ(0, controller.GetLastCommittedEntryIndex()); | 3405 EXPECT_EQ(0, controller.GetLastCommittedEntryIndex()); |
| 3406 | 3406 |
| 3407 EXPECT_EQ(frame_url_1, frame->current_url()); | 3407 EXPECT_EQ(frame_url_1, frame->current_url()); |
| 3408 } | 3408 } |
| 3409 | 3409 |
| 3410 } // namespace content | 3410 } // namespace content |
| OLD | NEW |