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 2200 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',
             ],
+            'conditions': [
+              [ 'icu_use_data_file_flag == 0', {
+                # 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',
+                ],
+              }],
+            ],
             # 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 78 matching lines @@
         [ 'use_v8_in_net==1', {
             'dependencies': [
               '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"', {
-            'dependencies': [
-              '../third_party/icu/icu.gyp:icudata',
-            ],
-            # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-            'msvs_disabled_warnings': [4267, ],
-          },
-        ],
+          'conditions': [
+            [ 'icu_use_data_file_flag == 0', {
+              # 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',
+              ],
+            }],
+          ],
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [4267, ],

[wtc, 2014/01/21 22:13:45]

Nit: the indentation of lines 2334-2344 probably should be two spaces more, to
match the indentation of similar code in this file. (I have to say I would use
the indentation you used, but it may be better to be consistent.)

+        }],
       ],
     },
     {
       'target_name': 'net_test_support',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../net/tools/tld_cleanup/tld_cleanup.gyp:tld_cleanup_util',
         '../testing/gtest.gyp:gtest',
@@ skipping 771 matching lines @@
             'net_unittests.isolate',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }