| 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 ui::PAGE_TRANSITION_TYPED | | 64 ui::PAGE_TRANSITION_TYPED | |
| 65 ui::PAGE_TRANSITION_FROM_ADDRESS_BAR); | 65 ui::PAGE_TRANSITION_FROM_ADDRESS_BAR); |
| 66 window->GetController().LoadURLWithParams(params); | 66 window->GetController().LoadURLWithParams(params); |
| 67 same_tab_observer.Wait(); | 67 same_tab_observer.Wait(); |
| 68 } | 68 } |
| 69 | 69 |
| 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 | 73 |
| 74 web_contents_ = window_->CreateWebContents(initial_size, browser_context()); | 74 web_contents_ = window_->CreateWebContents( |
| 75 initial_size, |
| 76 CastBrowserProcess::GetInstance()->browser_context()); |
| 75 window_->CreateWindowTree(initial_size, web_contents_.get()); | 77 window_->CreateWindowTree(initial_size, web_contents_.get()); |
| 76 return web_contents_.get(); | 78 return web_contents_.get(); |
| 77 } | 79 } |
| 78 | 80 |
| 79 } // namespace shell | 81 } // namespace shell |
| 80 } // namespace chromecast | 82 } // namespace chromecast |
| OLD | NEW |