Fix windows static library build of app_shell_browsertests.

Fix windows static library build of app_shell / app_shell_browsertests / app_shell_unittests.

BUG=399363
Committed: https://crrev.com/6c0aaa6ee9ff659cbae080363004b4ff21002ab3
Cr-Commit-Position: refs/heads/master@{#299236}

[lfg, 2014-10-10 20:58:47]

lfg@chromium.org changed reviewers:
+ yoz@chromium.org

[lfg, 2014-10-10 20:59:24]

PTAL

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

LGTM, thanks for looking at this.

https://codereview.chromium.org/649793003/diff/1/extensions/shell/app_shell.gyp
File extensions/shell/app_shell.gyp (right):

https://codereview.chromium.org/649793003/diff/1/extensions/shell/app_shell.g...
extensions/shell/app_shell.gyp:203: ['OS=="win"', {
You can merge this with an "and" (Python syntax applies)

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

[lfg, 2014-10-10 21:17:15]

Please, take another look. I should have tested this before, but app_shell and
app_shell_unittests have the same issue, so I fixed it in all of them.

https://codereview.chromium.org/649793003/diff/1/extensions/shell/app_shell.gyp
File extensions/shell/app_shell.gyp (right):

https://codereview.chromium.org/649793003/diff/1/extensions/shell/app_shell.g...
extensions/shell/app_shell.gyp:203: ['OS=="win"', {
On 2014/10/10 21:01:49, Yoyo Zhou wrote:
> You can merge this with an "and" (Python syntax applies)
> 
> 'OS=="win" and win_use_allocator_shim==1'

Done.

[Yoyo Zhou, 2014-10-10 21:46:32]

LGTM

[Yoyo Zhou, 2014-10-10 22:06:23]

The CQ bit was checked by yoz@chromium.org

[commit-bot: I haz the power, 2014-10-10 22:07:16]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/649793003/160001

[commit-bot: I haz the power, 2014-10-10 22:17:57]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-10 22:17:57]

Try jobs failed on following builders:
  win_gpu_triggered_tests on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/win_gpu_triggered...)

[Yoyo Zhou, 2014-10-10 22:22:12]

The CQ bit was checked by yoz@chromium.org

[commit-bot: I haz the power, 2014-10-10 22:22:58]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/649793003/160001

[commit-bot: I haz the power, 2014-10-10 22:30:04]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-10 22:30:06]

Try jobs failed on following builders:
  win_gpu_triggered_tests on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/win_gpu_triggered...)

[lfg, 2014-10-11 05:30:18]

The CQ bit was checked by lfg@chromium.org

[commit-bot: I haz the power, 2014-10-11 05:30:53]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/649793003/160001

[commit-bot: I haz the power, 2014-10-11 05:31:21]

Committed patchset #3 (id:160001)

[commit-bot: I haz the power, 2014-10-11 05:32:29]

Patchset 3 (id:??) landed as
https://crrev.com/6c0aaa6ee9ff659cbae080363004b4ff21002ab3
Cr-Commit-Position: refs/heads/master@{#299236}