Excluded non-chromeos source files in chromeos build

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': {
     'build_angle_deqp_tests%': 0,
     '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',
@@ skipping 865 matching lines @@
       'browser/chromeos/system/tray_accessibility_browsertest.cc',
       'browser/download/notification/download_notification_browsertest.cc',
       'browser/drive/drive_notification_manager_factory_browsertest.cc',
       'browser/extensions/api/certificate_provider/certificate_provider_apitest.cc',
       'browser/extensions/api/vpn_provider/vpn_provider_apitest.cc',
       'browser/ui/webui/options/chromeos/accounts_options_browsertest.cc',
       'browser/ui/webui/options/chromeos/guest_mode_options_browsertest.cc',
       'browser/ui/webui/options/chromeos/guest_mode_options_ui_browsertest.cc',
       'browser/ui/webui/options/chromeos/shared_options_browsertest.cc',
     ],
-    'chrome_browser_tests_views_non_cros_or_mac_sources': [
+    'chrome_browser_tests_views_non_cros_sources': [
       # This should be brought up on OSX Views but not CrOS.
       'browser/ui/views/profiles/profile_chooser_view_browsertest.cc',
     ],
     'chrome_browser_tests_speech_sources': [
       'browser/speech/extension_api/tts_extension_apitest.cc',
       'browser/speech/speech_recognition_browsertest.cc',
     ],
     'chrome_browser_tests_full_safe_browsing_sources': [
       'browser/safe_browsing/safe_browsing_blocking_page_test.cc',
       'browser/safe_browsing/safe_browsing_service_browsertest.cc',
@@ skipping 1744 matching lines @@
         }],
         ['toolkit_views==1', {
           'sources': [ '<@(chrome_browser_tests_views_sources)' ],
           'dependencies': [
             '../ui/views/views.gyp:views',
           ],
         }],
         ['toolkit_views==1 and OS!="mac"', {
           'sources': [ '<@(chrome_browser_tests_views_non_mac_sources)' ],
         }],
-        ['toolkit_views==1 and OS!="mac" and chromeos == 0', {
-          'sources': [ '<@(chrome_browser_tests_views_non_cros_or_mac_sources)' ],
+        ['toolkit_views==1 and (OS!="mac" or mac_views_browser==1) and chromeos == 0', {
+          'sources': [ '<@(chrome_browser_tests_views_non_cros_sources)' ],
         }],
         ['OS=="linux" or OS=="win"', {
           'sources': [ '<@(chrome_browser_tests_non_mac_desktop_sources)' ],
         }],
         ['OS=="ios"', {
           'sources!': [
             # TODO(dbeam): log webui URLs on iOS and test them.
             'browser/ui/webui/log_web_ui_url_browsertest.cc',
           ],
         }],
@@ skipping 924 matching lines @@
             'browser',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
           ],
         }]
     }],
   ],  # 'conditions'
 }