[iOS] Define bundle_data target for //net:net_unittests.

net/BUILD.gn

 # Copyright (c) 2013 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("//build/buildflag_header.gni")
 import("//build/config/chromecast_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
@@ skipping 682 matching lines @@
     ]
   }
 
   configs += [
     "//build/config:precompiled_headers",
 
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
 
+  # net/test/cert_test_util.cc depends on the test data, so this needs

[mattm, 2016/03/16 20:28:33]

Any idea why this wasn't a problem in gyp?

I guess in gyp the other tests that needed it copied it themselves?:
https://code.google.com/p/chromium/codesearch#chromium/src/ios/web/ios_web_un...
https://code.google.com/p/chromium/codesearch#chromium/src/components/compone...

Should we modify gyp to match this or vice versa?

[sdefresne, 2016/03/17 16:02:22]

With gyp, due to how the files are moved into the test application bundle, there
was not way to have a single target cause the correct file to be copied to the
correct location in the application bundle (this is only true for tests as they
use build/copy_test_data_ios.gypi template that requires knowing the name of the
final application).

This is not true with gn (since I did take this into consideration when
designing the support for bundle in gn). So, sadly, no there is no way to have
them match.

I can however split net_unittests_bundle_data in two, one that contains only
net/data/ssl/certificates (for test_support) and the other that contains the
data required for net_unittests only. WDYT?

+  # to be a dependency of the test_support target.
+  deps = [
+    ":net_unittests_bundle_data",
+  ]
+
   public_deps = [
     "//base",
     "//base/test:test_support",
     "//crypto",
     "//net",
     "//net/tools/tld_cleanup",
     "//testing/gmock",
     "//testing/gtest",
     "//url",
   ]
@@ skipping 652 matching lines @@
       ":net",
       ":simple_quic_tools",
       "//base",
       "//build/config/sanitizers:deps",
       "//third_party/boringssl",
       "//third_party/protobuf:protobuf_lite",
     ]
   }
 }
 
+bundle_data("net_unittests_bundle_data") {
+  sources = [
+    "data",

[mattm, 2016/03/16 20:28:33]

I think we should maintain symmetry between gyp and gn in whether to list
individual directories or the whole data dir. (Re:
https://code.google.com/p/chromium/codesearch#chromium/src/net/net.gyp&l=371)

[Dirk Pranke, 2016/03/16 22:02:20]

Agreed we should probably match lists to avoid confusion. Also, directories
should end in a trailing "/".

[sdefresne, 2016/03/17 16:02:22]

Agreed for keeping the list in sync.

As mentioned in
https://codereview.chromium.org/1806033002/diff/1/ui/gfx/BUILD.gn using a
trailing "/" is currently not possible. I'll see how I can fix this in gn, but
if possible, I'd like to land the CL as is and come back later to convert to a
trailing "/".

+  ]
+  outputs = [
+    "{{bundle_resources_dir}}/" +
+        "{{source_root_relative_dir}}/{{source_file_part}}",
+  ]
+}
+
 test("net_unittests") {
   sources = gypi_values.net_test_sources
 
   if (is_ios) {
     sources -= [
       "websockets/websocket_stream_cookie_test.cc",
       "websockets/websocket_stream_create_test_base.cc",
       "websockets/websocket_stream_create_test_base.h",
     ]
   }
 
   configs += [
     "//build/config:precompiled_headers",
 
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
   defines = []
 
   deps = [
     ":balsa",
     ":extras",
     ":http_server",
     ":net",
+    ":net_unittests_bundle_data",
     ":simple_quic_tools",
     ":stale_while_revalidate_experiment_domains",
     ":test_support",
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//crypto",
     "//crypto:platform",
     "//crypto:test_support",
     "//net/base/registry_controlled_domains",
@@ skipping 202 matching lines @@
   if (!enable_mdns) {
     sources -= [
       "dns/mdns_cache_unittest.cc",
       "dns/mdns_client_unittest.cc",
       "dns/record_parsed_unittest.cc",
       "dns/record_rdata_unittest.cc",
     ]
   }
 
   if (is_ios) {
-    # TODO(GYP)
-    #  'actions': [
-    #    {
-    #      'action_name': 'copy_test_data',
-    #      'variables': {
-    #        'test_data_files': [
-    #          'data/certificate_policies_unittest/',
-    #          'data/name_constraints_unittest/',
-    #          'data/parse_certificate_unittest/',
-    #          'data/ssl/certificates/',
-    #          'data/test.html',
-    #          'data/url_request_unittest/',
-    #          'data/verify_certificate_chain_unittest/',
-    #          'data/verify_name_match_unittest/names/',
-    #        ],
-    #        'test_data_prefix': 'net',
-    #      },
-    #      'includes': [ '../build/copy_test_data_ios.gypi' ],
-    #    },
-    #  ],
     sources -= [
       # TODO(droger): The following tests are disabled because the
       # implementation is missing or incomplete.
       # KeygenHandler::GenKeyAndSignChallenge() is not ported to iOS.
       "base/keygen_handler_unittest.cc",
       "disk_cache/backend_unittest.cc",
       "disk_cache/blockfile/block_files_unittest.cc",
 
       # Need to read input data files.
       "filter/brotli_filter_unittest.cc",
@@ skipping 280 matching lines @@
     "//base",
     "//net",
   ]
 }
 
 buildflag_header("features") {
   header = "net_features.h"
 
   flags = [ "ENABLE_BIDIRECTIONAL_STREAM=$enable_bidirectional_stream" ]
 }