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

extensions/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("//tools/grit/grit_rule.gni")
 import("//tools/grit/repack.gni")
 
 # GYP version: extensions/extensions_resources.gyp:extensions_resources
 group("extensions_resources") {
   deps = [
@@ skipping 40 matching lines @@
     deps = [
       "//device/serial:serial_mojo",
     ]
   }
 }
 
 source_set("test_support") {
   sources = [
     "browser/api/dns/mock_host_resolver_creator.cc",
     "browser/api/dns/mock_host_resolver_creator.h",
-    "browser/api/storage/settings_test_util.cc",
-    "browser/api/storage/settings_test_util.h",
     "browser/api_test_utils.cc",
     "browser/api_test_utils.h",
     "browser/extensions_test.cc",
     "browser/extensions_test.h",
-    "browser/mock_extension_system.cc",
-    "browser/mock_extension_system.h",
     "browser/test_extensions_browser_client.cc",
     "browser/test_extensions_browser_client.h",
     "browser/test_management_policy.cc",
     "browser/test_management_policy.h",
     "browser/test_runtime_api_delegate.cc",
     "browser/test_runtime_api_delegate.h",
     "common/extension_builder.cc",
     "common/extension_builder.h",
     "common/test_util.cc",
     "common/test_util.h",
@@ skipping 63 matching lines @@
     "//content/shell:resources",
     "//content:resources",
     "//extensions/shell:resources",
     "//extensions/strings",
     "//ui/resources",
     "//ui/strings",
   ]
 }
 
 # TODO(GYP): Enable this link errors are fixed.
-# This gives a link error in web_modal that is very mysterious. The GYP build
-# doesn't seem to pull in web_content_modal_dialog_manager.o since the build
-# does not have a reference to CreateNativeWebModalManager but it still links.
-# The GN build fails with this symbol being undefined.
 if (false) {
 # TODO(tfarina): Many extension unit tests run as part of Chrome"s
 # unit_tests target. They should be moved here, which may require some
 # refactoring (ExtensionsBrowserClient, TestingProfile, etc.).
 # http://crbug.com/348066
 test("unittests") {
   output_name = "extensions_unittests"
 
   sources = [
-    "browser/admin_policy_unittest.cc",
-    "browser/api/api_resource_manager_unittest.cc",
-    "browser/api/declarative/deduping_factory_unittest.cc",
-    "browser/api/sockets_tcp/sockets_tcp_api_unittest.cc",
-    "browser/api/storage/settings_quota_unittest.cc",
-    "browser/api/storage/storage_api_unittest.cc",
-    "browser/api/storage/storage_frontend_unittest.cc",
-    "browser/computed_hashes_unittest.cc",
-    "browser/content_hash_tree_unittest.cc",
-    "browser/event_listener_map_unittest.cc",
-    "browser/event_router_unittest.cc",
-    "browser/api_unittest.cc",
-    "browser/api_unittest.h",
-    "browser/extension_pref_value_map_unittest.cc",
-    "browser/extension_registry_unittest.cc",
-    "browser/file_highlighter_unittest.cc",
-    "browser/file_reader_unittest.cc",
-    "browser/guest_view/guest_view_manager_unittest.cc",
-    "browser/image_loader_unittest.cc",
-    "browser/image_util_unittest.cc",
     "browser/info_map_unittest.cc",
-    "browser/lazy_background_task_queue_unittest.cc",
-    "browser/management_policy_unittest.cc",
     "browser/process_manager_unittest.cc",
-    "browser/process_map_unittest.cc",
-    "browser/quota_service_unittest.cc",
-    "browser/runtime_data_unittest.cc",
-    "browser/value_store/leveldb_value_store_unittest.cc",
-    "browser/value_store/testing_value_store_unittest.cc",
-    "browser/value_store/value_store_change_unittest.cc",
-    "browser/value_store/value_store_frontend_unittest.cc",
-    "browser/value_store/value_store_unittest.cc",
-    "browser/value_store/value_store_unittest.h",
-    "browser/verified_contents_unittest.cc",
-    "browser/warning_service_unittest.cc",
     "common/api/sockets/sockets_manifest_permission_unittest.cc",
     "common/csp_validator_unittest.cc",
     "common/event_filter_unittest.cc",
     "common/extension_resource_unittest.cc",
     "common/extension_set_unittest.cc",
     "common/manifest_handler_unittest.cc",
     "common/message_bundle_unittest.cc",
     "common/one_shot_event_unittest.cc",
     "common/permissions/manifest_permission_set_unittest.cc",
     "common/url_pattern_set_unittest.cc",
     "common/url_pattern_unittest.cc",
     "common/user_script_unittest.cc",
     "renderer/activity_log_converter_strategy_unittest.cc",
     "renderer/api/serial/data_receiver_unittest.cc",
     "renderer/api/serial/data_sender_unittest.cc",
     "renderer/api/serial/serial_api_unittest.cc",
     "renderer/api_test_base.cc",
     "renderer/api_test_base.h",
     "renderer/api_test_base_unittest.cc",
     "renderer/event_unittest.cc",
     "renderer/json_schema_unittest.cc",
     "renderer/messaging_utils_unittest.cc",
     "renderer/module_system_test.cc",
     "renderer/module_system_test.h",
     "renderer/module_system_unittest.cc",
     "renderer/safe_builtins_unittest.cc",
     "renderer/script_context_set_unittest.cc",
     "renderer/utils_unittest.cc",
     "test/extensions_unittests_main.cc",
-  ]
+ ]
 
   deps = [
     ":extensions_resources",
     ":shell_and_test_pak",
     ":test_support",
     "//base",
-    "//base:prefs_test_support",
     "//base/test:test_support",
-    "//components/keyed_service/content",
     "//content/test:test_support",
     "//device/serial",
     "//device/serial:test_util",
     "//extensions/common",
     "//extensions/renderer",
     "//extensions/strings",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
     "//mojo/bindings/js",
     "//mojo/system",
     "//testing/gmock",
     "//testing/gtest",
-    "//third_party/leveldatabase",
   ]
 
   if (is_win) {
     deps += [
       "//base/allocator",
     ]
   }
 }
 }