[chromecast] Merge ChromecastBrowserTestHelper into ChromecastBrowserTest

chromecast/browser/BUILD.gn

 # Copyright 2015 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.
 
 import("//build/config/ui.gni")
 import("//chromecast/chromecast.gni")
 import("//testing/test.gni")
 import("//tools/grit/grit_rule.gni")
 
 if (is_android) {
@@ skipping 144 matching lines @@
     "cast_browser_resources.pak",
   ]
 }
 
 source_set("test_support") {
   testonly = true
 
   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",
     "//content/test:test_support",
   ]
 
   deps = [
     "//base",
     "//chromecast/app",
     "//chromecast/base",
@@ skipping 16 matching lines @@
 
   deps = [
     ":browser",
     "//base",
     "//chromecast/app",
     "//chromecast/base",
     "//content/test:test_support",
     "//mojo/edk/system",
     "//testing/gtest",
   ]
+
+  if (chromecast_branding != "public") {
+    deps += [ "//chromecast/internal:cast_shell_internal" ]
+  }
 }
 
 test("cast_shell_browser_test") {
   sources = [
     "test/chromecast_shell_browser_test.cc",
     "test/chromecast_shell_media_blocking_browser_test.cc",
   ]
 
   configs += [ ":browser_test_config" ]
 
   deps = [
     ":test_support",
     "//base",
     "//chromecast:chromecast_features",
     "//content/test:test_support",
     "//media/base:test_support",
     "//testing/gtest",
     "//url",
   ]
 
   # 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") {
     # Link default libcast_media_1.0 statically not to link dummy one
     # dynamically for public unittests.
     deps += [ "//chromecast/media/base:libcast_media_1.0_default_core" ]
   }
 }
 
 if (is_android) {
   generate_jni("jni_headers") {
     sources = [
       "android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java",
       "android/apk/src/org/chromium/chromecast/shell/CastMetricsHelper.java",
       "android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java",
       "android/apk/src/org/chromium/chromecast/shell/CastWindowAndroid.java",
       "android/apk/src/org/chromium/chromecast/shell/CastWindowManager.java",
     ]
 
     jni_package = "chromecast"
   }
 }