Cleanup: Combine some identical conditionals in chrome gyp targets.

Cleanup: Combine some identical conditionals in chrome gyp targets.

Committed: https://crrev.com/a7d8801090fc2c2da5a84b9c600666395d4a5d54
Cr-Commit-Position: refs/heads/master@{#292125}

[Lei Zhang, 2014-08-27 01:27:25]

thestig@chromium.org changed reviewers:
+ sadrul@chromium.org

[Lei Zhang, 2014-08-27 01:27:25]

This will conflict with your PDF CL, BTW.

[sadrul, 2014-08-27 01:40:34]

lgtm

[Lei Zhang, 2014-08-27 01:48:01]

The CQ bit was checked by thestig@chromium.org

[commit-bot: I haz the power, 2014-08-27 01:49:08]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/thestig@chromium.org/513623002/1

[commit-bot: I haz the power, 2014-08-27 02:42:03]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  linux_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/...)
  win_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/win_gpu/builds/52099)
  linux_chromium_chromeos_rel_swarming on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  linux_chromium_rel_swarming on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  win8_chromium_rel on tryserver.chromium.win
(http://build.chromium.org/p/tryserver.chromium.win/builders/win8_chromium_rel...)
  win_chromium_compile_dbg on tryserver.chromium.win
(http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_comp...)
  win_chromium_rel_swarming on tryserver.chromium.win
(http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)
  win_chromium_x64_rel_swarming on tryserver.chromium.win
(http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_...)

[Lei Zhang, 2014-08-27 02:45:46]

The CQ bit was unchecked by thestig@chromium.org

[Lei Zhang, 2014-08-27 07:04:49]

The CQ bit was checked by thestig@chromium.org

[commit-bot: I haz the power, 2014-08-27 07:05:25]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/thestig@chromium.org/513623002/20001

[commit-bot: I haz the power, 2014-08-27 08:35:18]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  mac_chromium_rel_swarming on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[commit-bot: I haz the power, 2014-08-27 09:17:01]

Committed patchset #2 (20001) as 3f181716bc2d2369d869cadaee3ca07161f4250a

[commit-bot: I haz the power, 2014-09-10 02:50:42]

Patchset 2 (id:??) landed as
https://crrev.com/a7d8801090fc2c2da5a84b9c600666395d4a5d54
Cr-Commit-Position: refs/heads/master@{#292125}