Enable icu_use_data_file on Windows

net/net.gyp

 # Copyright 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'use_tracing_cache_backend%': 0,
@@ skipping 2158 matching lines @@
               'dns/mdns_query_unittest.cc',
               'dns/record_parsed_unittest.cc',
               'dns/record_rdata_unittest.cc',
             ],
         }],
         [ 'OS == "win"', {
             'sources!': [
               'dns/dns_config_service_posix_unittest.cc',
               'http/http_auth_gssapi_posix_unittest.cc',
             ],
-            # This is needed to trigger the dll copy step on windows.
-            # TODO(mark): Specifying this here shouldn't be necessary.
             'dependencies': [
-              '../third_party/icu/icu.gyp:icudata',
               '../third_party/nss/nss.gyp:nspr',
               '../third_party/nss/nss.gyp:nss',
               'third_party/nss/ssl.gyp:libssl',
             ],
+            # This is needed to trigger the dll copy step on windows.

[Mark Mentovai, 2013/12/17 22:12:02]

Move into the conditon.

[jungshik at Google, 2013/12/18 20:59:11]

Done.

+            # TODO(mark): Specifying this here shouldn't be necessary.
+            'conditions': [
+              [ 'icu_use_data_file_flag == 0', {
+                  'dependencies': [
+                    '../third_party/icu/icu.gyp:icudata',
+                  ],
+                },
+              ],
+            ],
             # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
             'msvs_disabled_warnings': [4267, ],
           },
         ],
         [ 'OS == "mac"', {
             'dependencies': [
               '../third_party/nss/nss.gyp:nspr',
               '../third_party/nss/nss.gyp:nss',
               'third_party/nss/ssl.gyp:libssl',
             ],
@@ skipping 80 matching lines @@
               'net_with_v8',
             ],
           }, {  # else: !use_v8_in_net
             'sources!': [
               'proxy/proxy_resolver_perftest.cc',
             ],
           },
         ],
         # This is needed to trigger the dll copy step on windows.
         # TODO(mark): Specifying this here shouldn't be necessary.
-        [ 'OS == "win"', {
+        [ 'OS == "win" and icu_use_data_file_flag == 0', {
             'dependencies': [
               '../third_party/icu/icu.gyp:icudata',
             ],
             # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
             'msvs_disabled_warnings': [4267, ],
           },
         ],
       ],
     },
     {
@@ skipping 790 matching lines @@
             'net_unittests.isolate',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }