Commit 3d915b21 authored by John Abd-El-Malek's avatar John Abd-El-Malek Committed by Commit Bot

Run url_loader_unittest.cc on iOS as it already passes.

Bug: 753658
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: I4fa031a0044307c56351a4d5072d7fcee1b8f053
Reviewed-on: https://chromium-review.googlesource.com/895262Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533344}
parent 0235c2b6
...@@ -106,6 +106,7 @@ source_set("tests") { ...@@ -106,6 +106,7 @@ source_set("tests") {
"udp_socket_factory_unittest.cc", "udp_socket_factory_unittest.cc",
"udp_socket_unittest.cc", "udp_socket_unittest.cc",
"upload_progress_tracker_unittest.cc", "upload_progress_tracker_unittest.cc",
"url_loader_unittest.cc",
] ]
if (!is_ios) { if (!is_ios) {
...@@ -114,7 +115,6 @@ source_set("tests") { ...@@ -114,7 +115,6 @@ source_set("tests") {
# http://crbug.com/803149 # http://crbug.com/803149
"network_service_unittest.cc", "network_service_unittest.cc",
"proxy_resolver_factory_mojo_unittest.cc", "proxy_resolver_factory_mojo_unittest.cc",
"url_loader_unittest.cc",
] ]
} }
......
...@@ -22,9 +22,13 @@ source_set("run_all_service_tests") { ...@@ -22,9 +22,13 @@ source_set("run_all_service_tests") {
"//ui/base", "//ui/base",
] ]
if (is_ios) {
deps += [ ":tests_bundle_data" ]
} else {
data = [ data = [
"data/", "data/",
] ]
}
data_deps = [ data_deps = [
"//ui/resources:ui_test_pak_data", "//ui/resources:ui_test_pak_data",
...@@ -38,3 +42,32 @@ source_set("run_all_service_tests") { ...@@ -38,3 +42,32 @@ source_set("run_all_service_tests") {
deps += [ "//ui/ozone" ] deps += [ "//ui/ozone" ]
} }
} }
bundle_data("tests_bundle_data") {
visibility = [ ":run_all_service_tests" ]
testonly = true
sources = [
"//services/test/data/content-sniffer-test0.html",
"//services/test/data/content-sniffer-test0.html.mock-http-headers",
"//services/test/data/content-sniffer-test1.html",
"//services/test/data/content-sniffer-test1.html.mock-http-headers",
"//services/test/data/content-sniffer-test2.html",
"//services/test/data/content-sniffer-test2.html.mock-http-headers",
"//services/test/data/content-sniffer-test4.html",
"//services/test/data/content-sniffer-test4.html.mock-http-headers",
"//services/test/data/empty.html",
"//services/test/data/hello.html",
"//services/test/data/hello.html.mock-http-headers",
"//services/test/data/nocache.html",
"//services/test/data/nocache.html.mock-http-headers",
"//services/test/data/nosniff-test.html",
"//services/test/data/nosniff-test.html.mock-http-headers",
"//services/test/data/redirect307-to-echo",
"//services/test/data/redirect307-to-echo.mock-http-headers",
"//services/test/data/simple_page.html",
]
outputs = [
"{{bundle_resources_dir}}/" +
"{{source_root_relative_dir}}/{{source_file_part}}",
]
}
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