Revert 98426 - Revert 98103 - Switch to using .pak files for locale data on Windows.

chrome/chrome_tests.gypi

 # Copyright (c) 2011 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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 2146 matching lines @@
         }],
         ['os_posix == 1 and OS != "mac"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-          'dependencies': [
-            'packed_resources',
-          ],
-        }],
         ['OS=="mac"', {
            # The test fetches resources which means Mac need the app bundle to
            # exist on disk so it can pull from it.
           'dependencies': [
             'chrome',
             'closure_blocks_leopard_compat',
             '../third_party/ocmock/ocmock.gyp:ocmock',
           ],
           'include_dirs': [
             '../third_party/GTM',
@@ skipping 32 matching lines @@
           #
           # Enough pluses to make get this target prepended to the target's
           # list of dependencies.
           'dependencies+++': [
             '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
           ],
         }, { # OS != "mac"
           'dependencies': [
             'convert_dict_lib',
             'packed_extra_resources',
+            'packed_resources',
             '../third_party/hunspell/hunspell.gyp:hunspell',
           ],
           'sources!': [
             'browser/spellchecker/spellchecker_platform_engine_unittest.cc',
           ],
         }],
         ['OS=="win"', {
           'dependencies': [
             'chrome_version_resources',
             'installer_util_strings',
@@ skipping 975 matching lines @@
           },
         }, { # else: OS != "win"
           'sources!': [
             'browser/sync/util/data_encryption_unittest.cc',
           ],
         }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:ssl',
-            'packed_resources'
           ],
         }],
         ['OS=="mac"', {
           # See the comment in this section of the unit_tests target for an
           # explanation (crbug.com/43791 - libwebcore.a is too large to mmap).
           'dependencies+++': [
             '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
           ],
           'dependencies': [
             'helper_app'
           ],
         },{  # OS!="mac"
           'dependencies': [
             'packed_extra_resources',
+            'packed_resources'
           ],
         }],
         ['OS=="linux" and chromeos==1', {
           'include_dirs': [
             '<(grit_out_dir)',
           ],
         }],
       ],
     },
     {
@@ skipping 884 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }