Commit 944eb92f authored by jbudorick's avatar jbudorick Committed by Commit bot

Fix //net:test_support.

Targets that depend on //net:test_support should be able to use
//net/data with no additional configuration.

BUG=

Review-Url: https://codereview.chromium.org/2065313002
Cr-Commit-Position: refs/heads/master@{#400684}
parent 848ab72c
...@@ -371,7 +371,6 @@ if (!is_android) { ...@@ -371,7 +371,6 @@ if (!is_android) {
data = [ data = [
"data/", "data/",
"//content/test/data/", "//content/test/data/",
"//net/data/ssl/certificates/",
"//net/tools/testserver/", "//net/tools/testserver/",
"//ppapi/tests/test_case.html", "//ppapi/tests/test_case.html",
"//ppapi/tests/test_case.html.mock-http-headers", "//ppapi/tests/test_case.html.mock-http-headers",
...@@ -893,7 +892,6 @@ if (!is_android) { ...@@ -893,7 +892,6 @@ if (!is_android) {
"//content/test/data/", "//content/test/data/",
"//google_apis/test/", "//google_apis/test/",
"//media/test/data/", "//media/test/data/",
"//net/data/",
"//net/tools/testserver/", "//net/tools/testserver/",
"//ppapi/tests/test_case.html", "//ppapi/tests/test_case.html",
"//ppapi/tests/test_case.html.mock-http-headers", "//ppapi/tests/test_case.html.mock-http-headers",
...@@ -1744,7 +1742,6 @@ test("unit_tests") { ...@@ -1744,7 +1742,6 @@ test("unit_tests") {
"//components/test/data/", "//components/test/data/",
"//extensions/test/data/", "//extensions/test/data/",
"//google_apis/test/data/", "//google_apis/test/data/",
"//net/data/",
"//net/tools/testserver/", "//net/tools/testserver/",
"//third_party/accessibility-audit/axs_testing.js", "//third_party/accessibility-audit/axs_testing.js",
"//third_party/chaijs/chai.js", "//third_party/chaijs/chai.js",
......
...@@ -179,7 +179,6 @@ test("chromeos_unittests") { ...@@ -179,7 +179,6 @@ test("chromeos_unittests") {
data = [ data = [
"test/data/", "test/data/",
"//net/data/",
] ]
} }
......
...@@ -43,8 +43,4 @@ source_set("unit_tests") { ...@@ -43,8 +43,4 @@ source_set("unit_tests") {
"//net:test_support", "//net:test_support",
"//testing/gtest", "//testing/gtest",
] ]
data = [
"//net/data/",
]
} }
...@@ -403,7 +403,6 @@ test("content_browsertests") { ...@@ -403,7 +403,6 @@ test("content_browsertests") {
data = [ data = [
"$root_out_dir/content_shell.pak", "$root_out_dir/content_shell.pak",
"data/", "data/",
"//net/data/",
"//media/test/data/", "//media/test/data/",
] ]
...@@ -625,7 +624,6 @@ test("content_unittests") { ...@@ -625,7 +624,6 @@ test("content_unittests") {
data = [ data = [
"$root_out_dir/content_shell.pak", "$root_out_dir/content_shell.pak",
"data/", "data/",
"//net/data/ssl/certificates/",
"//media/test/data/", "//media/test/data/",
] ]
} }
......
...@@ -215,7 +215,6 @@ test("extensions_browsertests") { ...@@ -215,7 +215,6 @@ test("extensions_browsertests") {
data = [ data = [
"test/data/", "test/data/",
"//net/data/",
"//net/tools/testserver/", "//net/tools/testserver/",
"//third_party/pyftpdlib/", "//third_party/pyftpdlib/",
"//third_party/pywebsocket/", "//third_party/pywebsocket/",
...@@ -242,6 +241,7 @@ test("extensions_browsertests") { ...@@ -242,6 +241,7 @@ test("extensions_browsertests") {
"//device/usb:test_support", "//device/usb:test_support",
"//mojo/edk/js", "//mojo/edk/js",
"//mojo/public/cpp/bindings", "//mojo/public/cpp/bindings",
"//net:test_support",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
] ]
......
...@@ -632,6 +632,10 @@ source_set("test_support") { ...@@ -632,6 +632,10 @@ source_set("test_support") {
":test_support_bundle_data", ":test_support_bundle_data",
] ]
data = [
"data/",
]
if (!is_ios) { if (!is_ios) {
public_deps += [ "//third_party/protobuf:py_proto" ] public_deps += [ "//third_party/protobuf:py_proto" ]
} }
...@@ -1429,9 +1433,7 @@ test("net_unittests") { ...@@ -1429,9 +1433,7 @@ test("net_unittests") {
"//url:url_features", "//url:url_features",
] ]
data = [ data = []
"data/",
]
data_deps = [ data_deps = [
"third_party/nist-pkits/", "third_party/nist-pkits/",
] ]
......
...@@ -155,12 +155,6 @@ test("remoting_unittests") { ...@@ -155,12 +155,6 @@ test("remoting_unittests") {
"//build/config/compiler:no_size_t_to_int_warning", "//build/config/compiler:no_size_t_to_int_warning",
] ]
data = [
"//net/data/ssl/certificates/ok_cert.pem",
"//net/data/ssl/certificates/unittest.key.bin",
"//net/data/ssl/certificates/unittest.selfsigned.der",
]
deps = [ deps = [
":test_support", ":test_support",
"//base", "//base",
......
...@@ -123,6 +123,7 @@ source_set("unit_tests") { ...@@ -123,6 +123,7 @@ source_set("unit_tests") {
deps = [ deps = [
":test_support", ":test_support",
"//net:test_support",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
] ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment