Remove Chrome OS-only sources only if the OS is Chrome OS.

Remove Chrome OS-only sources only if the OS is Chrome OS.

If the OS is not Chrome OS, those sources are automatically removed
because their file pathnames contain "chromeos". So we can't remove
them from 'sources' again -- GN treats that as an error.

Re-enable the Chrome OS input method tests for use_ozone because
bug 362698 has been fixed.

R=kpschoedel@chromium.org,sky@chromium.org
BUG=354036, 362698
Committed: https://crrev.com/f991e90c57eeed424830f5eac357a5557e11a74b
Cr-Commit-Position: refs/heads/master@{#320596}

[wtc, 2015-03-13 00:42:06]

wtc@chromium.org changed reviewers:
+ fengyuan@chromium.org, kpschoedel@chromium.org, sky@chromium.org
- brettw@chromium.org

[wtc, 2015-03-13 00:42:55]

sky: please review.

fengyuan, kpschoedel: just FYI.

https://codereview.chromium.org/1003853005/diff/1/chrome/chrome_tests.gypi
File chrome/chrome_tests.gypi (right):

https://codereview.chromium.org/1003853005/diff/1/chrome/chrome_tests.gypi#ne...
chrome/chrome_tests.gypi:2139: 'sources': [
'<@(chrome_browser_tests_chromeos_sources)' ],

This 'chromeos == 1' section is an appropriate place to remove those two
chromeos .cc files because the first one, input_method_engine_browsertests.cc,
is part of chrome_browser_tests_chromeos_sources.

https://codereview.chromium.org/1003853005/diff/1/chrome/chrome_tests_unit.gypi
File chrome/chrome_tests_unit.gypi (right):

https://codereview.chromium.org/1003853005/diff/1/chrome/chrome_tests_unit.gy...
chrome/chrome_tests_unit.gypi:2349: 'sources': [
'<@(chrome_unit_tests_chromeos_sources)' ],

This 'chromeos==1' section is the right place to remove
event_rewriter_unittest.cc because it is part of
chrome_unit_tests_chromeos_sources.

[wtc, 2015-03-13 14:09:58]

I have a question for the Ozone folks.

https://codereview.chromium.org/1003853005/diff/1/chrome/chrome_tests.gypi
File chrome/chrome_tests.gypi (right):

https://codereview.chromium.org/1003853005/diff/1/chrome/chrome_tests.gypi#ne...
chrome/chrome_tests.gypi:2163: # crbug.com/362698

Since bug 362698 has been fixed, perhaps we can run these tests on Chrome OS and
don't need to exclude these two test source files any more?

[kpschoedel, 2015-03-13 15:39:57]

https://codereview.chromium.org/1003853005/diff/1/chrome/chrome_tests.gypi
File chrome/chrome_tests.gypi (right):

https://codereview.chromium.org/1003853005/diff/1/chrome/chrome_tests.gypi#ne...
chrome/chrome_tests.gypi:2163: # crbug.com/362698
On 2015/03/13 14:09:58, wtc wrote:
> 
> Since bug 362698 has been fixed, perhaps we can run these tests on Chrome OS
and
> don't need to exclude these two test source files any more?

Yes, good catch.

[wtc, 2015-03-13 17:43:55]

https://codereview.chromium.org/1003853005/diff/1/chrome/chrome_tests.gypi
File chrome/chrome_tests.gypi (right):

https://codereview.chromium.org/1003853005/diff/1/chrome/chrome_tests.gypi#ne...
chrome/chrome_tests.gypi:2163: # crbug.com/362698

On 2015/03/13 15:39:57, kpschoedel wrote:
> On 2015/03/13 14:09:58, wtc wrote:
> > 
> > Since bug 362698 has been fixed, perhaps we can run these tests on Chrome OS
> and
> > don't need to exclude these two test source files any more?
> 
> Yes, good catch.

Thanks for confirming. I re-enabled those two test source files for use_ozone
builds in patch set 2.

[wtc, 2015-03-13 17:44:54]

wtc@chromium.org changed reviewers:
- fengyuan@chromium.org

[sky, 2015-03-13 20:46:36]

LGTM

[wtc, 2015-03-13 21:54:10]

The CQ bit was checked by wtc@chromium.org

[commit-bot: I haz the power, 2015-03-13 21:54:35]

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

[commit-bot: I haz the power, 2015-03-13 22:42:24]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2015-03-13 22:43:35]

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