Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6694)

Unified Diff: chromecast/shell/browser/test/chromecast_browser_test.cc

Issue 638803002: Reorganizes Chromecast code to better reflect functional dependencies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: extra DEPS: chromecast/crash/android --> chromecast/common Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromecast/shell/browser/test/chromecast_browser_test.cc
diff --git a/chromecast/shell/browser/test/chromecast_browser_test.cc b/chromecast/shell/browser/test/chromecast_browser_test.cc
deleted file mode 100644
index 19250751e5f63ec18f066a01a2ea5cd7b37f3d25..0000000000000000000000000000000000000000
--- a/chromecast/shell/browser/test/chromecast_browser_test.cc
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chromecast/shell/browser/test/chromecast_browser_test.h"
-
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "base/message_loop/message_loop.h"
-#include "chromecast/shell/browser/cast_browser_context.h"
-#include "chromecast/shell/browser/cast_browser_process.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/render_process_host.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/test/browser_test_utils.h"
-#include "content/public/test/test_navigation_observer.h"
-
-namespace chromecast {
-namespace shell {
-
-ChromecastBrowserTest::ChromecastBrowserTest()
- : setup_called_(false) {
-}
-
-ChromecastBrowserTest::~ChromecastBrowserTest() {
- CHECK(setup_called_) << "Overridden SetUp() did not call parent "
- << "implementation, so test not run.";
-}
-
-void ChromecastBrowserTest::SetUp() {
- SetUpCommandLine(CommandLine::ForCurrentProcess());
- setup_called_ = true;
- BrowserTestBase::SetUp();
-}
-
-void ChromecastBrowserTest::RunTestOnMainThreadLoop() {
- // Pump startup related events.
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- base::RunLoop().RunUntilIdle();
-
- SetUpOnMainThread();
-
- RunTestOnMainThread();
-
- TearDownOnMainThread();
-
- for (content::RenderProcessHost::iterator i(
- content::RenderProcessHost::AllHostsIterator());
- !i.IsAtEnd(); i.Advance()) {
- i.GetCurrentValue()->FastShutdownIfPossible();
- }
-
- web_contents_.reset();
-}
-
-void ChromecastBrowserTest::NavigateToURL(content::WebContents* window,
- const GURL& url) {
- content::WaitForLoadStop(window);
- content::TestNavigationObserver same_tab_observer(window, 1);
- content::NavigationController::LoadURLParams params(url);
- params.transition_type = ui::PageTransitionFromInt(
- ui::PAGE_TRANSITION_TYPED |
- ui::PAGE_TRANSITION_FROM_ADDRESS_BAR);
- window->GetController().LoadURLWithParams(params);
- same_tab_observer.Wait();
-}
-
-content::WebContents* ChromecastBrowserTest::CreateBrowser() {
- content::WebContents::CreateParams create_params(
- CastBrowserProcess::GetInstance()->browser_context(),
- NULL);
- create_params.routing_id = MSG_ROUTING_NONE;
- create_params.initial_size = gfx::Size(1280, 720);
- web_contents_.reset(content::WebContents::Create(create_params));
- return web_contents_.get();
-}
-
-} // namespace shell
-} // namespace chromecast

Powered by Google App Engine
This is Rietveld 408576698