| Index: extensions/BUILD.gn
|
| diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
|
| index 3e8c5aca3fbf59d8497506dd13555bbf5c3d1949..af762dbdba2e6bdfe16eee8d78c5040153a5c3d7 100644
|
| --- a/extensions/BUILD.gn
|
| +++ b/extensions/BUILD.gn
|
| @@ -1,4 +1,3 @@
|
| -# 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.
|
|
|
| @@ -12,7 +11,6 @@ import("//tools/grit/repack.gni")
|
|
|
| assert(enable_extensions)
|
|
|
| -# GYP version: extensions/extensions_resources.gyp:extensions_resources
|
| group("extensions_resources") {
|
| public_deps = [
|
| ":extensions_browser_resources",
|
| @@ -21,8 +19,6 @@ group("extensions_resources") {
|
| ]
|
| }
|
|
|
| -# GYP version: extensions/extensions_resources.gyp:extensions_resources
|
| -# (extensions_resources action)
|
| grit("extensions_resources_grd") {
|
| source = "extensions_resources.grd"
|
| outputs = [
|
| @@ -31,8 +27,6 @@ grit("extensions_resources_grd") {
|
| ]
|
| }
|
|
|
| -# GYP version: extensions/extensions_resources.gyp:extensions_resources
|
| -# (extensions_browser_resources action)
|
| grit("extensions_browser_resources") {
|
| source = "browser/resources/extensions_browser_resources.grd"
|
| outputs = [
|
| @@ -48,8 +42,6 @@ grit("extensions_browser_resources") {
|
| ]
|
| }
|
|
|
| -# GYP version: extensions/extensions_resources.gyp:extensions_resources
|
| -# (extensions_renderer_resources action)
|
| grit("extensions_renderer_resources") {
|
| source = "renderer/resources/extensions_renderer_resources.grd"
|
| outputs = [
|
| @@ -104,7 +96,6 @@ static_library("test_support") {
|
| ]
|
| }
|
|
|
| -# GYP version: //extensions/extensions.gyp:extensions_shell_and_test_pak
|
| repack("shell_and_test_pak") {
|
| sources = [
|
| "$root_gen_dir/blink/devtools_resources.pak",
|
| @@ -141,19 +132,10 @@ repack("shell_and_test_pak") {
|
| }
|
|
|
| test("extensions_unittests") {
|
| - sources =
|
| - rebase_path(extensions_tests_gypi_values.extensions_unittests_sources,
|
| - ".",
|
| - "//extensions")
|
| -
|
| - sources += [
|
| - # TODO(rockot): DisplayInfoProvider::Create() is only implemented in Chrome
|
| - # and app_shell. This is wrong.
|
| - "shell/browser/shell_display_info_provider.cc",
|
| + sources = [
|
| + "test/extensions_unittests_main.cc",
|
| ]
|
|
|
| - configs += [ "//build/config:precompiled_headers" ]
|
| -
|
| data = [
|
| "test/data/",
|
| "//chrome/test/data/extensions/",
|
| @@ -166,57 +148,28 @@ test("extensions_unittests") {
|
| ":extensions_resources",
|
| ":shell_and_test_pak",
|
| ":test_support",
|
| - "//base",
|
| "//base/test:test_support",
|
| - "//components/keyed_service/content",
|
| - "//components/pref_registry:test_support",
|
| - "//components/prefs:test_support",
|
| - "//components/user_prefs",
|
| + "//content/public/common",
|
| "//content/test:test_support",
|
| - "//device/bluetooth:mocks",
|
| - "//device/core",
|
| - "//device/hid",
|
| - "//device/serial",
|
| - "//device/serial:test_support",
|
| + "//extensions/browser:unit_tests",
|
| "//extensions/common",
|
| - "//extensions/common/api/cast_channel:cast_channel_proto",
|
| - "//extensions/renderer",
|
| - "//extensions/strings",
|
| - "//extensions/utility",
|
| - "//mojo/edk/js",
|
| + "//extensions/common:unit_tests",
|
| + "//extensions/renderer:unit_tests",
|
| + "//extensions/shell:unit_tests",
|
| + "//extensions/utility:unit_tests",
|
| "//mojo/edk/system",
|
| - "//mojo/public/cpp/bindings",
|
| - "//services/shell/public/interfaces",
|
| - "//testing/gmock",
|
| - "//testing/gtest",
|
| - "//third_party/leveldatabase",
|
| + "//mojo/edk/test:test_support",
|
| + "//ui/gl:test_support",
|
| ]
|
|
|
| data_deps = [
|
| "//third_party/mesa:osmesa",
|
| ]
|
| -
|
| - if (is_chromeos) {
|
| - sources += [
|
| - "browser/api/webcam_private/visca_webcam_unittest.cc",
|
| -
|
| - # TODO(rockot): There are two implementations of VpnServiceFactory, a
|
| - # stub in app_shell and a real one in Chrome. This is wrong.
|
| - "shell/browser/api/vpn_provider/vpn_service_factory.cc",
|
| - ]
|
| -
|
| - deps += [ "//chromeos:test_support" ]
|
| - }
|
| }
|
|
|
| test("extensions_browsertests") {
|
| - sources =
|
| - rebase_path(extensions_tests_gypi_values.extensions_browsertests_sources,
|
| - ".",
|
| - "//extensions")
|
| -
|
| data = [
|
| - "test/data/",
|
| + "//extensions/test/data/",
|
| "//net/tools/testserver/",
|
| "//third_party/pyftpdlib/",
|
| "//third_party/pywebsocket/",
|
| @@ -224,36 +177,14 @@ test("extensions_browsertests") {
|
| "$root_out_dir/extensions_shell_and_test.pak",
|
| ]
|
|
|
| - defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
|
| -
|
| deps = [
|
| - ":test_support",
|
| - "shell:app_shell_lib",
|
| -
|
| - # TODO(yoz): find the right deps
|
| - "//base",
|
| - "//base/test:test_support",
|
| - "//components/prefs:test_support",
|
| - "//components/storage_monitor:test_support",
|
| - "//content/test:test_support",
|
| - "//device/bluetooth:mocks",
|
| - "//device/core:mocks",
|
| - "//device/hid:mocks",
|
| - "//device/usb:test_support",
|
| - "//mojo/edk/js",
|
| - "//mojo/public/cpp/bindings",
|
| - "//net:test_support",
|
| - "//testing/gmock",
|
| - "//testing/gtest",
|
| + "//extensions/browser:browser_tests",
|
| + "//extensions/shell:browser_tests",
|
| ]
|
|
|
| data_deps = [
|
| "//third_party/mesa:osmesa",
|
| ]
|
| -
|
| - if (is_mac) {
|
| - deps += [ "shell:app_shell" ] # Needed for App Shell.app's Helper.
|
| - }
|
| }
|
|
|
| # TODO(rockot) bug 505926: These should be moved to extensions_browsertests but have
|
|
|