ui: Repack resources.

ui/aura/aura.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,
   },
   'targets': [
     {
@@ skipping 119 matching lines @@
     {
       'target_name': 'aura_test_support',
       'type': 'static_library',
       'dependencies': [
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
         '../compositor/compositor.gyp:compositor_test_support',
         '../events/events.gyp:events',
         '../gfx/gfx.gyp:gfx',
         '../ui.gyp:ui',
+        '../ui.gyp:ui_pak',
         '../ui_unittests.gyp:ui_test_support',
         'aura',
-        'aura_test_support_pak',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/aura_test_base.cc',
         'test/aura_test_base.h',
         'test/aura_test_helper.cc',
         'test/aura_test_helper.h',
         'test/env_test_helper.h',
         'test/event_generator.cc',
         'test/event_generator.h',
-        'test/test_aura_initializer.cc',
-        'test/test_aura_initializer.h',
         'test/test_cursor_client.cc',
         'test/test_cursor_client.h',
         'test/test_event_handler.cc',
         'test/test_event_handler.h',
         'test/test_focus_client.cc',
         'test/test_focus_client.h',
         'test/test_screen.cc',
         'test/test_screen.h',
         'test/test_window_tree_client.cc',
         'test/test_window_tree_client.h',
         'test/test_windows.cc',
         'test/test_windows.h',
         'test/test_window_delegate.cc',
         'test/test_window_delegate.h',
         'test/ui_controls_factory_aura.h',
         'test/ui_controls_factory_aurawin.cc',
         'test/ui_controls_factory_aurax11.cc',
         'test/window_test_api.cc',
         'test/window_test_api.h',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
     {
-      # We build a minimal set of resources required for aura_test_support.
-      'target_name': 'aura_test_support_pak',
-      'type': 'none',
-      'dependencies': [
-        '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
-        '<(DEPTH)/ui/ui.gyp:ui_resources',
-      ],
-      'variables': {
-        'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
-      },
-      'actions': [
-        {
-          'action_name': 'repack_aura_test_support_pack',
-          'variables': {
-            'pak_inputs': [
-              '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
-            ],
-          },
-          'inputs': [
-            '<(repack_path)',
-            '<@(pak_inputs)',
-          ],
-          'outputs': [
-            '<(PRODUCT_DIR)/aura_test_support_resources.pak',
-          ],
-          'action': ['python', '<(repack_path)', '<@(_outputs)',
-                     '<@(pak_inputs)'],
-        },
-      ],
-    },
-    {
       'target_name': 'aura_demo',
       'type': 'executable',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
         '../../skia/skia.gyp:skia',
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
         '../compositor/compositor.gyp:compositor',
         '../compositor/compositor.gyp:compositor_test_support',
@@ skipping 35 matching lines @@
       ],
       'sources': [
         'bench/bench_main.cc',
       ],
     },
     {
       'target_name': 'aura_unittests',
       'type': 'executable',
       'dependencies': [
         '../../base/base.gyp:test_support_base',
-        '../../chrome/chrome_resources.gyp:packed_resources',

[tfarina, 2013/10/31 01:23:08]

aura_unittests didn't fail for me locally. I expect things will be different on
the bots, specially on Windows and with XP.

[tony, 2013/10/31 19:48:34]

You tested on a clean build right?  It looks like you shouldn't need it.

         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
         '../compositor/compositor.gyp:compositor_test_support',
         '../compositor/compositor.gyp:compositor',
         '../events/events.gyp:events',
         '../gfx/gfx.gyp:gfx',
         '../gl/gl.gyp:gl',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         '../ui_unittests.gyp:ui_test_support',
@@ skipping 21 matching lines @@
         ['OS=="linux" and linux_use_tcmalloc==1', {
           'dependencies': [
            # See http://crbug.com/162998#c4 for why this is needed.
             '../../base/allocator/allocator.gyp:allocator',
           ],
         }],
       ],
     },
   ],
 }