[Chromecast] Replace architecure-based conditionals with flag.

chromecast/BUILD.gn

 # Copyright 2015 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.
 
 import("//build/config/features.gni")
 import("//build/config/locales.gni")
 import("//build/config/ui.gni")
 import("//chromecast/build/tests/cast_test.gni")
 import("//chromecast/chromecast.gni")
 import("//tools/grit/repack.gni")
@@ skipping 32 matching lines @@
     "//ui/base:ui_base_unittests",
     "//url:url_unittests",
   ]
 
   if (is_linux) {
     tests += [ "//chromecast/crash:cast_crash_unittests" ]
   }
 
   filters = []
 
-  if (target_cpu == "arm" && target_os == "linux") {
+  # Apply filters to embedded linux devices.
+  if (target_os == "linux" && !is_cast_desktop_build) {
     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 23 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 if (target_cpu != "arm" || target_os == "android") {
+  } else if (is_cast_desktop_build || target_os == "android") {

[byungchul, 2015/12/15 23:14:17]

It can be just "else".

[slan, 2015/12/16 02:48:00]

This was done to be explicit about the condition:

https://chromiumcodereview.appspot.com/1382713003/diff/1/chromecast/BUILD.gn?...

     filters += [
       # Disable PipelineIntegrationTest.BasicPlayback_MediaSource_VP9_WebM (not supported)
       "media_unittests --gtest_filter=-PipelineIntegrationTest.BasicPlayback_MediaSource_VP9_WebM",
     ]
   }
 
   if (!is_android) {
     tests += [
       "//chromecast/app:cast_shell_unittests",
       "//chromecast/browser:cast_shell_browser_test",
@@ skipping 158 matching lines @@
          chromecast_branding == "google")
   args = [
            "-b",
            "$chromecast_branding",
            "-g",
            rebase_path("$root_gen_dir/chromecast_strings"),
            "-x",
            rebase_path("$root_out_dir/chromecast_locales"),
          ] + locales
 }