Revert of Enable icu_use_data_file on Windows

base/base.gyp

 # Copyright (c) 2012 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,
   },
   'includes': [
     '../build/win_precompile.gypi',
@@ skipping 743 matching lines @@
             'message_loop/message_pump_glib_unittest.cc',
           ]
         }],
         ['OS == "linux" and linux_use_tcmalloc==1', {
             'dependencies': [
               'allocator/allocator.gyp:allocator',
             ],
           },
         ],
         ['OS == "win"', {
+          # This is needed to trigger the dll copy step on windows.
+          # TODO(mark): This should not be necessary.
+          'dependencies': [
+            '../third_party/icu/icu.gyp:icudata',
+          ],
           'sources!': [
             'file_descriptor_shuffle_unittest.cc',
             'files/dir_reader_posix_unittest.cc',
             'threading/worker_pool_posix_unittest.cc',
             'message_loop/message_pump_libevent_unittest.cc',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [
             4267,
           ],
+          # This is needed so base_unittests uses the allocator shim, as
+          # SecurityTest.MemoryAllocationRestriction* tests are dependent
+          # on tcmalloc.
+          # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into
+          # their own test suite.
           'conditions': [
-            # This is needed so base_unittests uses the allocator shim, as
-            # SecurityTest.MemoryAllocationRestriction* tests are dependent
-            # on tcmalloc.
-            # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into
-            # their own test suite.
             ['win_use_allocator_shim==1', {
               'dependencies': [
                 'allocator/allocator.gyp:allocator',
               ],
             }],
-            ['icu_use_data_file_flag==0', {
-              # This is needed to trigger the dll copy step on windows.
-              # TODO(mark): This should not be necessary.
-              'dependencies': [
-                '../third_party/icu/icu.gyp:icudata',
-              ],
-            }],
           ],
         }, {  # OS != "win"
           'dependencies': [
             '../third_party/libevent/libevent.gyp:libevent'
           ],
           'sources/': [
             ['exclude', '^win/'],
           ],
           'sources!': [
             'win/win_util_unittest.cc',
@@ skipping 615 matching lines @@
             'base_unittests.isolate',
           ],
           'sources': [
             'base_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }