[chromecast] Merge ChromecastBrowserTestHelper into ChromecastBrowserTest

chromecast/browser/test/chromecast_browser_test.h

Index: chromecast/browser/test/chromecast_browser_test.h
diff --git a/chromecast/browser/test/chromecast_browser_test.h b/chromecast/browser/test/chromecast_browser_test.h
index 7ced124718e7887510941dba707e23b1ad341dde..7a6dfe92fe26feddbaee5c3a2da2395aa8e5cc10 100644
--- a/chromecast/browser/test/chromecast_browser_test.h
+++ b/chromecast/browser/test/chromecast_browser_test.h
@@ -17,7 +17,8 @@ class WebContents;
 
 namespace chromecast {
 namespace shell {
-class ChromecastBrowserTestHelper;
+
+class CastContentWindow;
 
 // This test allows for running an entire browser-process lifecycle per unit
 // test, using Chromecast's cast_shell. This starts up the shell, runs a test
@@ -29,17 +30,16 @@ class ChromecastBrowserTest : public content::BrowserTestBase {
   ChromecastBrowserTest();
   ~ChromecastBrowserTest() override;
 
-  // testing::Test implementation:
+  // content::BrowserTestBase implementation:
   void SetUp() override;
-
-  // BrowserTestBase implementation:
+  void TearDownOnMainThread() override;
   void RunTestOnMainThreadLoop() override;
 
- protected:
-  std::unique_ptr<ChromecastBrowserTestHelper> helper_;
+  content::WebContents* NavigateToURL(const GURL& url);
 
  private:
-  bool setup_called_;
+  std::unique_ptr<CastContentWindow> window_;
+  std::unique_ptr<content::WebContents> web_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromecastBrowserTest);
 };