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

content/test/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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 
 content_tests_gypi_values = exec_script(
     "//build/gypi_to_gn.py",
     [ rebase_path("../content_tests.gypi"),
       "--replace=<(SHARED_INTERMEDIATE_DIR)=$root_gen_dir" ],
     "scope",
     [ "../content_tests.gypi" ])
 
 # GYP version //content/content_tests.gypi:test_support_content
 static_library("test_support") {
   deps = [
-    "//content/public/app:both",
+    "//content/public/app",
     "//content/public/browser",
     "//content/public/common",
     "//net:test_support",
     "//skia",
     "//storage/common",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/accessibility:ax_gen",
     "//ui/base",
     "//ui/base:test_support",
@@ skipping 122 matching lines @@
 
     if (is_android) {
       #deps += [ "test_support_content_jni_headers" ]  TODO(GYP)
     }
   }
 
 }  # !is_ios
 
 # TODO(GYP): Unit test targets