cros-chrome test fixes.

Remote Chrome OS fails on these tests.
* Disable testTelemetryUsesChromeClockDomain.
* Fix testVariationArgs.

BUG=chromium:895977

Change-Id: I62c852017033b57d942c5e7eb07b9cdc8a526e8b
Reviewed-on: https://chromium-review.googlesource.com/c/1284756Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Achuith Bhandarkar <achuith@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600838}

tools/perf/core/perf_benchmark_unittest.py

@@ -62,7 +62,8 @@ class PerfBenchmarkTest(unittest.TestCase):
     benchmark = perf_benchmark.PerfBenchmark()
     options = options_for_unittests.GetCopy()
     options.chrome_root = self._output_dir
-    options.browser_type = "any"
+    if not options.browser_type:
+      options.browser_type = "any"
     possible_browser = browser_finder.FindBrowser(options)
     if possible_browser is None:
       return

tools/perf/measurements/clock_domain_test.py

@@ -13,10 +13,10 @@ def GetSyncEvents(trace_part):
 
 class ClockDomainTest(tab_test_case.TabTestCase):
 
-  # Don't run this test on Android; it's not supposed to work on Android
-  # (since when doing Android tracing there are two different devices,
-  # so the clock domains will be different)
-  @decorators.Disabled('android')
+  # Don't run this test on Android and remote Chrome OS; it won't work
+  # because there are two different devices, so the clock domains will
+  # be different.
+  @decorators.Disabled('android', 'cros-chrome')
   @decorators.Isolated
   def testTelemetryUsesChromeClockDomain(self):