Revert Aura changes

ash/ash.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,
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
   },
 
   'targets': [
     {
       'target_name': 'ash',
       'type': '<(component)',
       'dependencies': [
-        'ash_strings',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/aura/aura.gyp:aura',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
@@ skipping 232 matching lines @@
             ['exclude', 'tooltips/tooltip_controller_unittest.cc'],
           ],
           'dependencies': [
             # Mac tests access resources via the 'AuraShell.app' directory.
             'ash_shell',
           ],
           # Special linker instructions that avoids stripping Obj-C classes that
           # are not referenced in code, but are referenced in nibs.
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
         }],
-        ['use_glib == 1', {
-          'dependencies': [
-            'aura_shell_unittests_strings',
-          ],
-        }],
       ],
     },
     {
       'target_name': 'ash_shell',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../chrome/chrome_resources.gyp:packed_resources',
         '../skia/skia.gyp:skia',
@@ skipping 46 matching lines @@
           ],
           'mac_bundle_resources!': [
             'shell/cocoa/app-Info.plist',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
           },
         }],
       ],
     },
-    {
-      'target_name': 'ash_strings',
-      'type': 'none',
-      'actions': [
-        # Localizable resources.
-        {
-          'action_name': 'ash_strings',
-          'variables': {
-            'grit_grd_file': 'ash_strings.grd',
-            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash_strings',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        },
-      ],
-      'includes': [ '../build/grit_target.gypi' ],
-    },
-  ],
-  'conditions': [
-    ['os_posix == 1 and OS != "mac"', {
-      'targets': [{
-        'target_name': 'aura_shell_unittests_strings',
-        'type': 'none',
-        'variables': {
-          'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
-        },
-        'actions': [
-          {
-            'action_name': 'repack_aura_shell_unittests_strings',
-            'variables': {
-              'pak_inputs': [
-                '<(SHARED_INTERMEDIATE_DIR)/ash_strings/ash_strings_en-US.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
-                '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
-              ],
-            },
-            'inputs': [
-              '<(repack_path)',
-              '<@(pak_inputs)',
-            ],
-            'outputs': [
-              '<(PRODUCT_DIR)/aura_shell_unittests_strings/en-US.pak',
-            ],
-            'action': ['python', '<(repack_path)', '<@(_outputs)',
-                       '<@(pak_inputs)'],
-          },
-        ],
-      }],
-    }],
   ],
 }