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

content/public/app/BUILD.gn

Index: content/public/app/BUILD.gn
diff --git a/content/public/app/BUILD.gn b/content/public/app/BUILD.gn
index fa087e3b056c4d9a925de8254fb3cfa17c2d91c8..37d2847278c0a071cc51d07a9cb112e18c0c2cfa 100644
--- a/content/public/app/BUILD.gn
+++ b/content/public/app/BUILD.gn
@@ -2,8 +2,7 @@
 # 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",
@@ -24,45 +23,3 @@
     "//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"
-    ]
-  }
-
-}