[Chromecast] Replace architecure-based conditionals with flag.

chromecast/chromecast_tests.gypi

 # Copyright (c) 2014 Google Inc. All Rights Reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1
   },
   'targets': [
     {
@@ skipping 93 matching lines @@
         '../net/net.gyp:net_unittests',
         '../ppapi/ppapi_internal.gyp:ppapi_unittests',
         '../sandbox/sandbox.gyp:sandbox_linux_unittests',
         '../sql/sql.gyp:sql_unittests',
         '../sync/sync.gyp:sync_unit_tests',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
         '../ui/base/ui_base_tests.gyp:ui_base_unittests',
         '../url/url.gyp:url_unittests',
       ],
       'conditions': [
-        ['target_arch=="arm" and OS!="android"', {
+        ['OS=="linux" and is_cast_desktop_build==0', {
           'variables': {
             'filters': [
               # Run net_unittests first to avoid random failures due to slow python startup
               # KeygenHandlerTest.SmokeTest and KeygenHandlerTest.ConcurrencyTest fail due to
               # readonly certdb (b/8153161)
               # URLRequestTestHTTP.GetTest_ManyCookies takes roughly 55s to run. Increase
               # timeout to 90s from 45s to allow it to pass (b/19821476)
               # ProxyScriptFetcherImplTest.HttpMimeType is flaking (b/19848784)
               # Running a batch of net_unittests has high overhead. Run tests in batches of 25 to reduce number of batches (b/23156294).
              'net_unittests --gtest_filter=-KeygenHandlerTest.SmokeTest:KeygenHandlerTest.ConcurrencyTest:ProxyScriptFetcherImplTest.HttpMimeType --test-launcher-timeout=90000 --test-launcher-batch-limit=25',
@@ skipping 21 matching lines @@
               #   AudioOutputControllerTest.PlaySwitchDeviceClose
               #   AudioStreamHandlerTest.Play
               #   SoundsManagerTest.Play
               # Disable AudioStreamHandlerTest.ConsecutivePlayRequests (b/16539293)
               'media_unittests --gtest_filter=-AudioOutputControllerTest.PlayDivertSwitchDeviceRevertClose:AudioOutputControllerTest.PlaySwitchDeviceClose:AudioStreamHandlerTest.Play:AudioStreamHandlerTest.ConsecutivePlayRequests:PipelineIntegrationTest.BasicPlayback_MediaSource_VP9_WebM:PipelineIntegrationTest.BasicPlayback_VideoOnly_VP9_WebM:PipelineIntegrationTest.BasicPlayback_VP9*:PipelineIntegrationTest.P444_VP9_WebM:PipelineIntegrationTest.BasicPlayback_VP8A*:OpusAudioDecoderTest/AudioDecoderTest.ProduceAudioSamples/0:SoundsManagerTest.Play',
               'sync_unit_tests --gtest_filter=-SyncHttpBridgeTest.*',
               # DoAppendUTF8Invalid fails because of dcheck_always_on flag in Eng builds
               'url_unittests --gtest_filter=-URLCanonTest.DoAppendUTF8Invalid',
             ],
           },
-        }, { # else "x86" or "android"
+        }, { # else desktop or android
           'variables': {
             'filters': [
               # Disable PipelineIntegrationTest.BasicPlayback_MediaSource_VP9_WebM (not supported)
               'media_unittests --gtest_filter=-PipelineIntegrationTest.BasicPlayback_MediaSource_VP9_WebM',
             ],
           }
         }],
         ['OS=="linux"', {
           'dependencies': [
             'cast_crash_unittests',
@@ skipping 250 matching lines @@
                 '-a', '<(test_additional_options)',
                 'pack_run',
               ],
             }
           ],
         },
       ],  # end of targets
     }],
   ],  # end of conditions
 }