[chromecast] Merge ChromecastBrowserTestHelper into ChromecastBrowserTest

chromecast/browser/test/chromecast_browser_test.cc

Index: chromecast/browser/test/chromecast_browser_test.cc
diff --git a/chromecast/browser/test/chromecast_browser_test.cc b/chromecast/browser/test/chromecast_browser_test.cc
index ac4c19f8da77cc6970f0b178276deaa81491c476..5bc37200ae111b2a1b087047a2d72422bc632cf2 100644
--- a/chromecast/browser/test/chromecast_browser_test.cc
+++ b/chromecast/browser/test/chromecast_browser_test.cc
@@ -10,44 +10,61 @@
 #include "chromecast/base/metrics/cast_metrics_helper.h"
 #include "chromecast/browser/cast_browser_context.h"
 #include "chromecast/browser/cast_browser_process.h"
-#include "chromecast/browser/test/chromecast_browser_test_helper.h"
+#include "chromecast/browser/cast_content_window.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() {}
 
-ChromecastBrowserTest::~ChromecastBrowserTest() {
-  CHECK(setup_called_) << "Overridden SetUp() did not call parent "

[alokp, 2016/11/08 19:02:44]

There is no need to check this here. It is already done in BrowserTestBase:
https://cs.chromium.org/chromium/src/content/public/test/browser_test_base.cc...

-                       << "implementation, so test not run.";
-}
+ChromecastBrowserTest::~ChromecastBrowserTest() {}
 
 void ChromecastBrowserTest::SetUp() {
   SetUpCommandLine(base::CommandLine::ForCurrentProcess());
-  setup_called_ = true;
+
   BrowserTestBase::SetUp();
 }
 
+void ChromecastBrowserTest::TearDownOnMainThread() {
+  web_contents_.reset();
+  window_.reset();
+
+  BrowserTestBase::TearDownOnMainThread();
+}
+
 void ChromecastBrowserTest::RunTestOnMainThreadLoop() {
   // Pump startup related events.
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   base::RunLoop().RunUntilIdle();
 
-  helper_ = ChromecastBrowserTestHelper::Create();
   metrics::CastMetricsHelper::GetInstance()->SetDummySessionIdForTesting();
-  SetUpOnMainThread();
 
+  SetUpOnMainThread();
   RunTestOnMainThread();
-
   TearDownOnMainThread();
+}
+
+content::WebContents* ChromecastBrowserTest::NavigateToURL(const GURL& url) {
+  window_ = base::MakeUnique<CastContentWindow>();
+
+  web_contents_ = window_->CreateWebContents(
+      CastBrowserProcess::GetInstance()->browser_context());
+  window_->CreateWindowTree(web_contents_.get());
+  content::WaitForLoadStop(web_contents_.get());
+
+  content::TestNavigationObserver same_tab_observer(web_contents_.get(), 1);
+  content::NavigationController::LoadURLParams params(url);
+  params.transition_type = ui::PageTransitionFromInt(
+      ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR);
+  web_contents_->GetController().LoadURLWithParams(params);
+  same_tab_observer.Wait();
 
-  helper_.reset();
+  return web_contents_.get();
 }
 
 }  // namespace shell