[Telemetry] Add Nexus5x/Nexus6 webview disabling to StoryExpectations.

telemetry/telemetry/story/expectations.py

 # Copyright 2017 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 logging
 
 
 class StoryExpectations(object):
   """An object that contains disabling expectations for benchmarks and stories.
 
@@ skipping 201 matching lines @@
     self._name = name
 
   def __str__(self):
     return self._name
 
   def ShouldDisable(self, platform, finder_options):
     if platform.GetOSName() != 'mac':
       return False
     return platform.GetOSVersionDetailString().startswith(self._version)
 
+
+class _TestConditionCompositeConditions(_TestCondition):

[charliea (OOO until 10-5), 2017/08/23 17:43:02]

I wonder if it makes sense to call this something like
"_TestConditionLogicalAnd" or "_TestConditionMatchesAll" or
"_TestConditionSatisfiesAll"? Technically, an OR is a composite of two
conditions, but it's not what this composite does, which makes me think that
just "composite" might not be specific enough.

[rnephew (Reviews Here), 2017/08/23 17:45:12]

Done.

+  def __init__(self, conditions, name):
+    self._conditions = conditions
+    self._name = name
+
+  def __str__(self):
+    return self._name
+
+  def ShouldDisable(self, platform, finder_options):
+    return all(
+        c.ShouldDisable(platform, finder_options) for c in self._conditions)
+
+
 ALL = _AllTestCondition()
 ALL_MAC = _TestConditionByPlatformList(['mac'], 'Mac Platforms')
 ALL_WIN = _TestConditionByPlatformList(['win'], 'Win Platforms')
 ALL_LINUX = _TestConditionByPlatformList(['linux'], 'Linux Platforms')
 ALL_ANDROID = _TestConditionByPlatformList(['android'], 'Android Platforms')
 ALL_DESKTOP = _TestConditionByPlatformList(
     ['mac', 'linux', 'win'], 'Desktop Platforms')
 ALL_MOBILE = _TestConditionByPlatformList(['android'], 'Mobile Platforms')
 ANDROID_NEXUS5 = _TestConditionByAndroidModel('Nexus 5')
 ANDROID_NEXUS5X = _TestConditionByAndroidModel('Nexus 5X')
 ANDROID_NEXUS6 = _TestConditionByAndroidModel('Nexus 6')
 ANDROID_NEXUS6P = _TestConditionByAndroidModel('Nexus 6P')
 ANDROID_NEXUS7 = _TestConditionByAndroidModel('Nexus 7')
 ANDROID_ONE = _TestConditionByAndroidModel(
     'W6210', 'Cherry Mobile Android One')
 ANDROID_SVELTE = _TestConditionAndroidSvelte()
 ANDROID_WEBVIEW = _TestConditionAndroidWebview()
 ANDROID_NOT_WEBVIEW = _TestConditionAndroidNotWebview()
 # MAC_10_11 Includes:
 #   Mac 10.11 Perf, Mac Retina Perf, Mac Pro 10.11 Perf, Mac Air 10.11 Perf
 MAC_10_11 = _TestConditionByMacVersion('10.11', 'Mac 10.11')
 # Mac 10_12 Includes:
 #   Mac 10.12 Perf, Mac Mini 8GB 10.12 Perf
 MAC_10_12 = _TestConditionByMacVersion('10.12', 'Mac 10.12')
+
+ANDROID_NEXUS6_WEBVIEW = _TestConditionCompositeConditions(
+    [ANDROID_NEXUS6, ANDROID_WEBVIEW], 'Nexus6 Webview')
+ANDROID_NEXUS5X_WEBVIEW = _TestConditionCompositeConditions(
+    [ANDROID_NEXUS5X, ANDROID_WEBVIEW], 'Nexus5X Webview')