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/browser/test/chromecast_browser_test.h" | 5 #include "chromecast/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/browser/cast_browser_context.h" | 10 #include "chromecast/browser/cast_browser_context.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 ChromecastBrowserTest::ChromecastBrowserTest() | 22 ChromecastBrowserTest::ChromecastBrowserTest() |
23 : setup_called_(false) { | 23 : setup_called_(false) { |
24 } | 24 } |
25 | 25 |
26 ChromecastBrowserTest::~ChromecastBrowserTest() { | 26 ChromecastBrowserTest::~ChromecastBrowserTest() { |
27 CHECK(setup_called_) << "Overridden SetUp() did not call parent " | 27 CHECK(setup_called_) << "Overridden SetUp() did not call parent " |
28 << "implementation, so test not run."; | 28 << "implementation, so test not run."; |
29 } | 29 } |
30 | 30 |
31 void ChromecastBrowserTest::SetUp() { | 31 void ChromecastBrowserTest::SetUp() { |
32 SetUpCommandLine(CommandLine::ForCurrentProcess()); | 32 SetUpCommandLine(base::CommandLine::ForCurrentProcess()); |
33 setup_called_ = true; | 33 setup_called_ = true; |
34 BrowserTestBase::SetUp(); | 34 BrowserTestBase::SetUp(); |
35 } | 35 } |
36 | 36 |
37 void ChromecastBrowserTest::RunTestOnMainThreadLoop() { | 37 void ChromecastBrowserTest::RunTestOnMainThreadLoop() { |
38 // Pump startup related events. | 38 // Pump startup related events. |
39 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 39 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
40 base::RunLoop().RunUntilIdle(); | 40 base::RunLoop().RunUntilIdle(); |
41 | 41 |
42 SetUpOnMainThread(); | 42 SetUpOnMainThread(); |
(...skipping 27 matching lines...) Expand all Loading... |
70 content::WebContents* ChromecastBrowserTest::CreateBrowser() { | 70 content::WebContents* ChromecastBrowserTest::CreateBrowser() { |
71 window_.reset(new CastContentWindow); | 71 window_.reset(new CastContentWindow); |
72 gfx::Size initial_size(1280, 720); | 72 gfx::Size initial_size(1280, 720); |
73 web_contents_ = window_->Create( | 73 web_contents_ = window_->Create( |
74 initial_size, CastBrowserProcess::GetInstance()->browser_context()); | 74 initial_size, CastBrowserProcess::GetInstance()->browser_context()); |
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 |