Fix windows static library build of app_shell_browsertests.

extensions/shell/app_shell.gyp

Index: extensions/shell/app_shell.gyp
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index 94993a98dcfee4071698d5fd46320b6a914a9701..a0928a4218c3688caf69c453d32b264ef0dc73b4 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -199,6 +199,17 @@
         'test/shell_test_launcher_delegate.h',
         'test/shell_tests_main.cc',
       ],
+      'conditions': [
+        ['OS=="win"', {

[Yoyo Zhou, 2014/10/10 21:01:49]

You can merge this with an "and" (Python syntax applies)

'OS=="win" and win_use_allocator_shim==1'

[lfg, 2014/10/10 21:17:14]

Done.

+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ],
+        }],
+      ],
     },
     {
       'target_name': 'app_shell_unittests',