Enable icu_use_data_file on Windows

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index b48a4c721e53951c5e88a438ce624198a0a92624..eebaf494e67fb31b8bed69a0fda6fcda04553d2e 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -2176,14 +2176,21 @@
               '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, ],
           },
@@ -2284,7 +2291,7 @@
         ],
         # 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',
             ],