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

telemetry/telemetry/story/expectations.py

Index: telemetry/telemetry/story/expectations.py
diff --git a/telemetry/telemetry/story/expectations.py b/telemetry/telemetry/story/expectations.py
index 6db8d90526ce338ef8be92d0764297e4e9133a16..259c03709e9453c5e619858ae7805990360ae1bc 100644
--- a/telemetry/telemetry/story/expectations.py
+++ b/telemetry/telemetry/story/expectations.py
@@ -219,6 +219,20 @@ class _TestConditionByMacVersion(_TestCondition):
       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')
@@ -243,3 +257,8 @@ 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')