Revert of Make ui gn check pass. Misc GN build improvements.

content/public/app/BUILD.gn

 # 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.
 
-# Used internally to hold the sources shared between the various targets below.
-source_set("app_sources") {
+source_set("app") {
   sources = [
     "android_library_loader_hooks.h",
     "content_main.h",
     "content_main_delegate.cc",
     "content_main_delegate.h",
     "content_main_runner.h",
     "startup_helper_win.h",
   ]
 
   configs += [ "//content:content_implementation" ]
 
   deps = [
     "//base",
     "//base:i18n",
     "//content:export",
     "//content/public/plugin",
     "//content/public/renderer",
     "//content/public/utility",
   ]
 }
-
-# The structure of this is like the private content/app implementation.
-if (is_component_build) {
-
-  group("app") {
-    deps = [
-      ":app_sources",
-      "//content/app",
-    ]
-  }
-  group("browser") {
-    deps = [ "//content" ]
-  }
-  group("child") {
-    deps = [ "//content" ]
-  }
-  group("both") {
-    deps = [ "//content" ]
-  }
-
-} else {
-
-  group("browser") {
-    deps = [
-      ":app_sources",
-      "//content/app:browser"
-    ]
-  }
-  group("child") {
-    deps = [
-      ":app_sources",
-      "//content/app:child"
-    ]
-  }
-  group("both") {
-    deps = [
-      ":app_sources",
-      "//content/app:both"
-    ]
-  }
-
-}