Revert 255512 "Introduce a mock ui_unittests Framework for loadi..."

trunk/src/ui/ui_unittests.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,
   },
   'targets': [
     {
@@ skipping 44 matching lines @@
           ],
         }],
       ],
     },
     {
       'target_name': 'ui_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
+        '../chrome/chrome_resources.gyp:packed_resources',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libpng/libpng.gyp:libpng',
         '../url/url.gyp:url_lib',
         'base/strings/ui_strings.gyp:ui_strings',
         'events/events.gyp:events_base',
         'gfx/gfx.gyp:gfx_geometry_unittests',
@@ skipping 203 matching lines @@
         }],
         ['use_x11==1 and use_aura==1',  {
           'sources': [
             'base/cursor/cursor_loader_x11_unittest.cc',
           ],
         }],
         ['OS=="mac"',  {
           'dependencies': [
             'events/events.gyp:events_test_support',
             'gfx/gfx.gyp:gfx_test_support',
-            'ui_unittests_bundle',
-          ],
-        }, { # OS!="mac"
-          'dependencies': [
-            'base/strings/ui_strings.gyp:ui_unittest_strings',
           ],
         }],
         ['use_aura==1 or toolkit_views==1',  {
           'sources': [
             'base/dragdrop/os_exchange_data_unittest.cc',
           ],
           'dependencies': [
             'events/events.gyp:events',
             'events/events.gyp:events_base',
             'events/events.gyp:events_test_support',
@@ skipping 30 matching lines @@
           'sources/': [
             # Pull in specific Mac files for iOS (which have been filtered out
             # by file name rules).
             ['include', '^base/l10n/l10n_util_mac_unittest\\.mm$'],
           ],
         }],
       ],
     },
   ],
   'conditions': [
-    # Mac target to build a test Framework bundle to mock out resource loading.
-    ['OS == "mac"', {
-      'targets': [
-        {
-          'target_name': 'ui_unittests_bundle',
-          'type': 'shared_library',
-          'dependencies': [
-            'resources/ui_resources.gyp:ui_test_pak',
-          ],
-          'includes': [ 'ui_unittests_bundle.gypi' ],
-        },
-      ],
-    }],
     # Special target to wrap a gtest_target_type==shared_library
     # ui_unittests into an android apk for execution.
     # See base.gyp for TODO(jrg)s about this strategy.
     ['OS == "android" and gtest_target_type == "shared_library"', {
       'targets': [
         {
           'target_name': 'ui_unittests_apk',
           'type': 'none',
           'dependencies': [
             'ui_unittests',
           ],
           'variables': {
             'test_suite_name': 'ui_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ui_unittests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }