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

chrome/chrome_tests.gypi

 # Copyright 2013 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': {
     'chrome_browser_extensions_test_support_sources': [
       # A list of sources which is shared between different browser tests.
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',
       'browser/extensions/browsertest_util.cc',
@@ skipping 2118 matching lines @@
           'dependencies': [
             '../ash/ash.gyp:ash_test_support',
           ],
         }],
         ['use_aura==1 or toolkit_views==1', {
           'dependencies': [
             '../ui/events/events.gyp:events_test_support',
           ],
         }],
         ['chromeos == 1', {
           'sources': [ '<@(chrome_browser_tests_chromeos_sources)' ],

[wtc, 2015/03/13 00:42:54]

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.

           'sources!': [
             '../apps/load_and_launch_browsertest.cc',
             'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc',
             'browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc',
             # chromeos does not support profile list avatar menu
             'browser/profiles/profile_list_desktop_browsertest.cc',
             'browser/service_process/service_process_control_browsertest.cc',
             'browser/signin/signin_browsertest.cc',
             # bookmark sign in promo not used on chromeos
             'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc',
             # chromeos does not use cross-platform panels
             'browser/ui/panels/panel_extension_browsertest.cc',
             # chromeos does not use the desktop user manager
             'browser/ui/webui/signin/user_manager_ui_browsertest.cc',
           ],
           'dependencies': [
             '../dbus/dbus.gyp:dbus_test_support',
             '../build/linux/system.gyp:dbus',
             '../ui/login/login.gyp:login_resources',
           ],
+          'conditions': [
+            ['use_ozone==1', {
+              'sources!': [
+                # crbug.com/362698

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

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]

Yes, good catch.

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

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

+                'browser/chromeos/input_method/input_method_engine_browsertests.cc',
+                'browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc',
+              ],
+            }],
+          ],
         }, {  # Non-ChromeOS
           'sources!': [
             'browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc',
             'browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc',
             'browser/extensions/api/terminal/terminal_private_apitest.cc',
             'browser/invalidation/profile_invalidation_provider_factory_browsertest.cc',
             'browser/net/nss_context_chromeos_browsertest.cc',
             'browser/ui/ash/keyboard_controller_browsertest.cc',
             'browser/ui/views/select_file_dialog_extension_browsertest.cc',
             'test/data/webui/certificate_viewer_dialog_test.js',
@@ skipping 233 matching lines @@
             'renderer/safe_browsing/phishing_classifier_browsertest.cc',
             'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc',
             'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc',
           ]
         }],
         ['enable_autofill_dialog!=1 or OS=="android" or OS=="ios"', {
           'dependencies!': [
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
           ],
         }],
-        ['use_ozone==1', {
-          'sources!': [
-            # crbug.com/362698
-            'browser/chromeos/input_method/input_method_engine_browsertests.cc',
-            'browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc',
-          ],
-        }],
         ['remoting==1', {
           'sources': [ '<@(chrome_browser_tests_remoting_sources)' ],
           'dependencies': [
             '../remoting/remoting.gyp:remoting_webapp',
           ]
         }],
         ['use_x11==1', {
           'dependencies': [
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
@@ skipping 743 matching lines @@
             ['enable_webrtc==1', {
               'dependencies': [
                 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
               ]
             }],
           ],
         }]
     }],
   ],  # 'conditions'
 }