Include ui_strings in aura_shell_unittests to fix the build

BUG=None
TEST=Run aura_shell_unittests

Review URL: https://chromiumcodereview.appspot.com/9316029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120053 0039d316-1c4b-4281-b951-d872f2087c98

ash/ash.gyp

@@ -266,6 +266,11 @@
           # are not referenced in code, but are referenced in nibs.
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
         }],
+        ['use_glib == 1', {
+          'dependencies': [
+            'aura_shell_unittests_strings',
+          ],
+        }],
       ],
     },
     {
@@ -341,6 +346,7 @@
           'action_name': 'ash_strings',
           'variables': {
             'grit_grd_file': 'ash_strings.grd',
+            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash_strings',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
@@ -348,4 +354,36 @@
       '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)'],
+          },
+        ],
+      }],
+    }],
+  ],
 }

ash/test/test_suite.cc

@@ -31,7 +31,12 @@ void AuraShellTestSuite::Initialize() {
 
 #if defined(OS_MACOSX)
   ash::test::OverrideFrameworkBundle();
-#endif
+#elif defined(OS_POSIX)
+  FilePath pak_dir;
+  PathService::Get(base::DIR_MODULE, &pak_dir);
+  pak_dir = pak_dir.AppendASCII("aura_shell_unittests_strings");
+  PathService::Override(ui::DIR_LOCALES, pak_dir);
+#endif  // defined(OS_MACOSX)
 
   // Force unittests to run using en-US so if we test against string
   // output, it'll pass regardless of the system language.