Index: content/test/BUILD.gn |
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn |
index f3f2162422ac0070e668913574e7e2c408d2be12..acb1539990eff130c7d3387224ebaed5054206d1 100644 |
--- a/content/test/BUILD.gn |
+++ b/content/test/BUILD.gn |
@@ -24,12 +24,6 @@ |
source_set("test_support") { |
testonly = true |
- # See comment at the top of //content/BUILD.gn for why this is disabled in |
- # component builds. |
- if (is_component_build) { |
- check_includes = false |
- } |
- |
configs += [ |
"//build/config:precompiled_headers", |
"//v8:external_startup_data", |
@@ -42,26 +36,19 @@ |
"//third_party/WebKit/public:blink", |
] |
deps = [ |
- ":browsertest_base", |
":content_test_mojo_bindings", |
- "//base/third_party/dynamic_annotations", |
"//cc", |
"//cc:test_support", |
"//cc/blink", |
- "//cc/surfaces", |
"//components/scheduler:scheduler", |
"//components/scheduler:test_support", |
- "//content/app:both_for_content_tests", |
"//content/browser/speech/proto", |
"//content/gpu", |
- "//content/public/browser", |
"//content/public/child", |
"//content/public/plugin", |
"//content/public/renderer", |
"//content/public/utility", |
- "//content/renderer:for_content_tests", |
"//content/shell:pak", |
- "//content/utility:for_content_tests", |
"//ipc:test_support", |
"//ipc/mojo", |
"//media", |
@@ -133,7 +120,6 @@ |
deps += [ |
"//third_party/libjingle:libjingle_webrtc", |
"//third_party/libjingle:libpeerconnection", |
- "//third_party/webrtc/base:rtc_base", |
"//third_party/webrtc/modules/video_capture", |
] |
} |
@@ -193,12 +179,6 @@ |
# browser tests. |
source_set("browsertest_support") { |
testonly = true |
- |
- # See comment at the top of //content/BUILD.gn for why this is disabled in |
- # component builds. |
- if (is_component_build) { |
- check_includes = false |
- } |
sources = [ |
"../public/test/content_browser_test.cc", |
@@ -212,24 +192,10 @@ |
] |
deps = [ |
- ":browsertest_base", |
- ":test_support", |
- "//base", |
- "//base:i18n", |
- "//base/test:test_config", |
- "//base/test:test_support", |
- "//cc/surfaces", |
- "//content/app:both_for_content_tests", |
- "//content/browser:for_content_tests", |
"//content/shell:content_shell_lib", |
- "//gin", |
- "//media", |
- "//net", |
"//skia", |
"//testing/gtest", |
"//ui/accessibility:ax_gen", |
- "//ui/base", |
- "//ui/base/ime", |
] |
if (is_android) { |
@@ -254,14 +220,12 @@ |
] |
public_deps = [ |
- "//content/browser:for_content_tests", |
"//content/public/browser", |
"//content/public/common", |
"//third_party/WebKit/public:blink", |
] |
deps = [ |
"//base:base", |
- "//content/public/app:both", |
"//net:test_support", |
"//testing/gtest", |
"//ui/base", |
@@ -289,13 +253,6 @@ |
# GYP version //content/content_tests.gypi:layouttest_support_content |
static_library("layouttest_support") { |
testonly = true |
- |
- # See comment at the top of //content/BUILD.gn for why this is disabled in |
- # component builds. |
- if (is_component_build) { |
- check_includes = false |
- } |
- |
sources = |
rebase_path(content_tests_gypi_values.layouttest_support_content_sources, |
".", |
@@ -306,11 +263,7 @@ |
"//cc", |
"//cc/blink", |
"//components/test_runner:test_runner", |
- "//content/browser:for_content_tests", |
"//content/public/common", |
- |
- #"//content/shell:content_shell_lib", |
- "//content/renderer:for_content_tests", |
"//mojo/edk/test:test_support", |
"//skia", |
"//ui/accessibility:ax_gen", |
@@ -386,12 +339,6 @@ |
} |
test("content_browsertests") { |
- # See comment at the top of //content/BUILD.gn for why this is disabled in |
- # component builds. |
- if (is_component_build) { |
- check_includes = false |
- } |
- |
sources = rebase_path(content_tests_gypi_values.content_browsertests_sources, |
".", |
"//content") |
@@ -442,22 +389,15 @@ |
deps = [ |
":browsertest_base", |
":browsertest_support", |
- ":content_test_mojo_bindings", |
":web_ui_test_mojo_bindings", |
"//base/test:test_support", |
- "//components/scheduler", |
"//content:resources", |
- "//content/app:both_for_content_tests", |
- "//content/browser:for_content_tests", |
"//content/browser/background_sync:background_sync_proto", |
"//content/common:mojo_bindings", |
"//content/gpu", |
- "//content/public/browser", |
- "//content/public/child", |
"//content/public/common", |
"//content/public/plugin", |
"//content/public/renderer", |
- "//content/renderer:for_content_tests", |
"//content/shell:content_shell_lib", |
"//content/shell:pak", |
"//content/test:test_support", |
@@ -466,9 +406,9 @@ |
"//device/vibration:mojo_bindings", |
"//gin", |
"//gpu", |
- "//gpu/blink", |
"//ipc:test_support", |
- "//media", |
+ "//media:media_features", |
+ "//media:shared_memory_support", |
"//media:test_support", |
"//media/audio:test_support", |
"//media/base:test_support", |
@@ -479,7 +419,6 @@ |
"//mojo/shell/public/cpp:cpp_for_chromium", |
"//mojo/test:test_support", |
"//net:test_support", |
- "//storage/browser", |
"//testing/gmock", |
"//testing/gtest", |
"//third_party/WebKit/public:blink", |
@@ -488,9 +427,8 @@ |
"//third_party/zlib", |
"//ui/accessibility", |
"//ui/accessibility:ax_gen", |
- "//ui/base:test_support", |
+ "//ui/base", |
"//ui/base/ime", |
- "//ui/compositor", |
"//ui/gfx", |
"//ui/gfx/geometry", |
"//ui/gl", |
@@ -509,7 +447,7 @@ |
"//ppapi/host", |
"//ppapi/proxy", |
"//ppapi/proxy:ipc", |
- "//ppapi/shared_impl:test_support", |
+ "//ppapi/shared_impl", |
] |
data_deps += [ "//ppapi:ppapi_tests" ] |
} |
@@ -586,7 +524,6 @@ |
content_tests_gypi_values.content_browsertests_plugins_sources, |
".", |
"//content") |
- deps += [ "//ppapi/proxy:test_support" ] |
data_deps += [ "//ppapi:ppapi_tests" ] |
} |
@@ -606,7 +543,6 @@ |
if (use_aura) { |
deps += [ |
- "//ui/aura", |
"//ui/touch_selection:test_support", |
"//ui/touch_selection:touch_selection", |
] |
@@ -620,12 +556,6 @@ |
} |
test("content_unittests") { |
- # See comment at the top of //content/BUILD.gn for why this is disabled in |
- # component builds. |
- if (is_component_build) { |
- check_includes = false |
- } |
- |
defines = [] |
sources = rebase_path(content_tests_gypi_values.content_unittests_sources, |
".", |
@@ -643,17 +573,14 @@ |
configs += [ "//build/config:precompiled_headers" ] |
deps = [ |
- ":content_test_mojo_bindings", |
":test_support", |
"//base/test:test_support", |
"//base/third_party/dynamic_annotations", |
"//cc", |
"//cc:test_support", |
"//cc/surfaces", |
- "//components/scheduler", |
"//content:resources", |
- "//content/app:both_for_content_tests", |
- "//content/browser:for_content_tests", |
+ "//content/browser/background_sync:background_sync_proto", |
"//content/browser/cache_storage:cache_storage_proto", |
"//content/browser/notifications:notification_proto", |
"//content/browser/service_worker:service_worker_proto", |
@@ -666,7 +593,6 @@ |
"//content/public/common:mojo_bindings", |
"//content/public/plugin", |
"//content/public/renderer", |
- "//content/renderer:for_content_tests", |
"//crypto", |
"//device/battery", |
"//device/battery:mojo_bindings", |
@@ -684,8 +610,6 @@ |
"//mojo/public/cpp/bindings", |
"//net:extras", |
"//net:test_support", |
- "//ppapi/c", |
- "//printing", |
"//skia", |
"//sql", |
"//sql:test_support", |
@@ -698,12 +622,11 @@ |
"//third_party/leveldatabase", |
"//third_party/libjingle", |
"//third_party/re2", |
- "//third_party/widevine/cdm:version_h", |
"//ui/accessibility", |
- "//ui/base:test_support", |
+ "//ui/base", |
"//ui/compositor:test_support", |
"//ui/events/blink", |
- "//ui/gfx:test_support", |
+ "//ui/gfx", |
"//ui/gfx/geometry", |
"//ui/gfx/ipc", |
"//ui/gl", |
@@ -723,11 +646,6 @@ |
rebase_path(content_tests_gypi_values.content_unittests_plugins_sources, |
".", |
"//content") |
- deps += [ |
- "//ppapi/host", |
- "//ppapi/proxy:test_support", |
- "//ppapi/shared_impl:test_support", |
- ] |
} |
if (enable_webrtc) { |
@@ -738,8 +656,6 @@ |
deps += [ |
"//third_party/libjingle:libjingle_webrtc", |
"//third_party/libjingle:libpeerconnection", |
- "//third_party/webrtc/base:rtc_base", |
- "//third_party/webrtc/modules/desktop_capture:primitives", |
"//third_party/webrtc/modules/video_capture", |
"//ui/shell_dialogs:shell_dialogs", |
] |
@@ -787,10 +703,7 @@ |
# Search for comments about "xcode_settings" in chrome_tests.gypi. |
ldflags = [ "-Wl,-ObjC" ] |
- deps += [ |
- "//third_party/mozilla", |
- "//third_party/ocmock", |
- ] |
+ deps += [ "//third_party/ocmock" ] |
} |
if (is_chromeos) { |
sources -= [ "../browser/geolocation/wifi_data_provider_linux_unittest.cc" ] |
@@ -825,8 +738,7 @@ |
if (use_aura) { |
deps += [ |
"//components/mus/public/cpp/tests:unittest_support", |
- "//content/renderer/mus", |
- "//ui/aura:test_support", |
+ "//ui/aura", |
"//ui/aura_extra", |
"//ui/wm", |
] |
@@ -871,19 +783,9 @@ |
if (is_mac && use_openssl) { |
deps += [ "//third_party/boringssl" ] |
} |
- |
- if (use_x11) { |
- deps += [ "//ui/gfx/x" ] |
- } |
} |
test("content_perftests") { |
- # See comment at the top of //content/BUILD.gn for why this is disabled in |
- # component builds. |
- if (is_component_build) { |
- check_includes = false |
- } |
- |
sources = [ |
"../browser/renderer_host/input/input_router_impl_perftest.cc", |
"../common/cc_messages_perftest.cc", |
@@ -892,7 +794,6 @@ |
deps = [ |
"//base/test:test_support", |
"//cc", |
- "//content/browser:for_content_tests", |
"//content/public/browser", |
"//content/public/common", |
"//content/test:test_support", |
@@ -909,12 +810,6 @@ |
} |
test("content_gl_tests") { |
- # See comment at the top of //content/BUILD.gn for why this is disabled in |
- # component builds. |
- if (is_component_build) { |
- check_includes = false |
- } |
- |
sources = [ |
"../browser/compositor/gl_helper_unittest.cc", |
"../common/gpu/client/gpu_in_process_context_tests.cc", |
@@ -924,13 +819,9 @@ |
deps = [ |
":test_support", |
"//base/test:test_support", |
- "//content/browser:for_content_tests", |
"//content/public/common", |
"//gpu/blink", |
- "//gpu/command_buffer/client:gl_in_process_context", |
- "//gpu/command_buffer/client:gles2_implementation", |
"//gpu/command_buffer/common", |
- "//media", |
"//testing/gtest", |
"//third_party/WebKit/public:blink", |
"//ui/base", |
@@ -956,12 +847,6 @@ |
} |
test("content_gl_benchmark") { |
- # See comment at the top of //content/BUILD.gn for why this is disabled in |
- # component builds. |
- if (is_component_build) { |
- check_includes = false |
- } |
- |
sources = [ |
"../browser/compositor/gl_helper_benchmark.cc", |
"run_gl_benchmark.cc", |
@@ -970,11 +855,8 @@ |
deps = [ |
":test_support", |
"//base/test:test_support", |
- "//content/browser:for_content_tests", |
"//content/public/common", |
"//gpu/blink", |
- "//gpu/command_buffer/client:gl_in_process_context", |
- "//gpu/command_buffer/client:gles2_implementation", |
"//testing/gtest", |
"//third_party/WebKit/public:blink", |
"//ui/base", |