Fix windows static library build of app_shell_browsertests.

extensions/shell/app_shell.gyp

 # Copyright 2014 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 181 matching lines @@
         '../browser/guest_view/web_view/web_view_media_access_apitest.cc',
         'browser/shell_browsertest.cc',
         'test/shell_apitest.cc',
         'test/shell_apitest.h',
         'test/shell_test.cc',
         'test/shell_test.h',
         'test/shell_test_launcher_delegate.cc',
         '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',
       'type': 'executable',
       'dependencies': [
         'app_shell_lib',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/content/content.gyp:content_app_both',
         '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content',
@@ skipping 54 matching lines @@
             '<@(_outputs)',
           ],
           'includes': [
             '../../build/util/version.gypi',
           ],
         },
       ],
     },
   ],  # targets
 }