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 876b61eb24f446ad0e0532c0aac4691b93b571b2..3651ecb01a49369b32ed12a728be5bd809706e8d 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -2218,14 +2218,20 @@
               '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, ],
           },
@@ -2324,16 +2330,19 @@
             ],
           },
         ],
-        # 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.)

+        }],
       ],
     },
     {