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 "chromecast/shell/browser/test/chromecast_browser_test.h" | 5 #include "chromecast/shell/browser/test/chromecast_browser_test.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "chromecast/shell/browser/cast_browser_context.h" | 10 #include "chromecast/shell/browser/cast_browser_context.h" |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 } | 51 } |
52 | 52 |
53 web_contents_.reset(); | 53 web_contents_.reset(); |
54 } | 54 } |
55 | 55 |
56 void ChromecastBrowserTest::NavigateToURL(content::WebContents* window, | 56 void ChromecastBrowserTest::NavigateToURL(content::WebContents* window, |
57 const GURL& url) { | 57 const GURL& url) { |
58 content::WaitForLoadStop(window); | 58 content::WaitForLoadStop(window); |
59 content::TestNavigationObserver same_tab_observer(window, 1); | 59 content::TestNavigationObserver same_tab_observer(window, 1); |
60 content::NavigationController::LoadURLParams params(url); | 60 content::NavigationController::LoadURLParams params(url); |
61 params.transition_type = content::PageTransitionFromInt( | 61 params.transition_type = ui::PageTransitionFromInt( |
62 content::PAGE_TRANSITION_TYPED | | 62 ui::PAGE_TRANSITION_TYPED | |
63 content::PAGE_TRANSITION_FROM_ADDRESS_BAR); | 63 ui::PAGE_TRANSITION_FROM_ADDRESS_BAR); |
64 window->GetController().LoadURLWithParams(params); | 64 window->GetController().LoadURLWithParams(params); |
65 same_tab_observer.Wait(); | 65 same_tab_observer.Wait(); |
66 } | 66 } |
67 | 67 |
68 content::WebContents* ChromecastBrowserTest::CreateBrowser() { | 68 content::WebContents* ChromecastBrowserTest::CreateBrowser() { |
69 content::WebContents::CreateParams create_params( | 69 content::WebContents::CreateParams create_params( |
70 CastBrowserProcess::GetInstance()->browser_context(), | 70 CastBrowserProcess::GetInstance()->browser_context(), |
71 NULL); | 71 NULL); |
72 create_params.routing_id = MSG_ROUTING_NONE; | 72 create_params.routing_id = MSG_ROUTING_NONE; |
73 create_params.initial_size = gfx::Size(1280, 720); | 73 create_params.initial_size = gfx::Size(1280, 720); |
74 web_contents_.reset(content::WebContents::Create(create_params)); | 74 web_contents_.reset(content::WebContents::Create(create_params)); |
75 return web_contents_.get(); | 75 return web_contents_.get(); |
76 } | 76 } |
77 | 77 |
78 } // namespace shell | 78 } // namespace shell |
79 } // namespace chromecast | 79 } // namespace chromecast |
OLD | NEW |