[chromecast] Merge ChromecastBrowserTestHelper into ChromecastBrowserTest

chromecast/browser/BUILD.gn

Index: chromecast/browser/BUILD.gn
diff --git a/chromecast/browser/BUILD.gn b/chromecast/browser/BUILD.gn
index 89a51c9e0936fbe4d1f062c0aec438d90a2663e7..b078233d02531fcadab9ff9005d294ef69049647 100644
--- a/chromecast/browser/BUILD.gn
+++ b/chromecast/browser/BUILD.gn
@@ -162,14 +162,9 @@ source_set("test_support") {
   sources = [
     "test/chromecast_browser_test.cc",
     "test/chromecast_browser_test.h",
-    "test/chromecast_browser_test_helper.h",
     "test/chromecast_browser_test_runner.cc",
   ]
 
-  if (chromecast_branding == "public") {
-    sources += [ "test/chromecast_browser_test_helper_default.cc" ]
-  }
-
   public_deps = [
     ":browser",
     "//chromecast:cast_shell_common",
@@ -206,6 +201,10 @@ test("cast_shell_tests") {
     "//mojo/edk/system",
     "//testing/gtest",
   ]
+
+  if (chromecast_branding != "public") {
+    deps += [ "//chromecast/internal:cast_shell_internal" ]
+  }
 }
 
 test("cast_shell_browser_test") {
@@ -229,7 +228,6 @@ test("cast_shell_browser_test") {
   # TODO(slan): Find a better way to do this.
   if (chromecast_branding != "public") {
     deps += [ "//chromecast/internal:cast_shell_internal" ]
-    deps += [ "//chromecast/internal/shell:cast_shell_browser_test_helper_internal" ]
   }
 
   if (chromecast_branding == "public") {