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/test/content_browser_test_utils_internal.h" | 5 #include "content/test/content_browser_test_utils_internal.h" |
6 | 6 |
7 #include "content/browser/frame_host/frame_tree_node.h" | 7 #include "content/browser/frame_host/frame_tree_node.h" |
8 #include "content/browser/frame_host/navigator.h" | 8 #include "content/browser/frame_host/navigator.h" |
9 #include "content/test/test_frame_navigation_observer.h" | 9 #include "content/test/test_frame_navigation_observer.h" |
10 #include "url/gurl.h" | 10 #include "url/gurl.h" |
11 | 11 |
12 namespace content { | 12 namespace content { |
13 | 13 |
14 void NavigateFrameToURL(FrameTreeNode* node, const GURL& url) { | 14 void NavigateFrameToURL(FrameTreeNode* node, const GURL& url) { |
15 TestFrameNavigationObserver observer(node); | 15 TestFrameNavigationObserver observer(node); |
16 NavigationController::LoadURLParams params(url); | 16 NavigationController::LoadURLParams params(url); |
17 params.transition_type = PageTransitionFromInt(PAGE_TRANSITION_LINK); | 17 params.transition_type = ui::PAGE_TRANSITION_LINK; |
18 params.frame_tree_node_id = node->frame_tree_node_id(); | 18 params.frame_tree_node_id = node->frame_tree_node_id(); |
19 node->navigator()->GetController()->LoadURLWithParams(params); | 19 node->navigator()->GetController()->LoadURLWithParams(params); |
20 observer.Wait(); | 20 observer.Wait(); |
21 } | 21 } |
22 | 22 |
23 } // namespace content | 23 } // namespace content |
OLD | NEW |