From 33a24bb8e807688771c408d7ae13d97e95566c78 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Tue, 5 Jan 2016 11:11:05 -0800
Subject: [PATCH] Include more styling tests under ShadowDOM. Fix custom-style
 media query test to work under both shadow/shady.

---
 test/runner.html            | 6 ++----
 test/unit/custom-style.html | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/runner.html b/test/runner.html
index 7ae43c2a1c..654381b6a1 100644
--- a/test/runner.html
+++ b/test/runner.html
@@ -56,10 +56,8 @@
       'unit/styling-remote.html',
       'unit/styling-cross-scope-var.html',
       'unit/styling-cross-scope-apply.html',
-      // TODO(sorvell): disable until this Chrome bug is addressed:
-      // https://code.google.com/p/chromium/issues/detail?id=525280
-      // 'unit/styling-cross-scope-var.html?dom=shadow',
-      // 'unit/styling-cross-scope-apply.html?dom=shadow',
+      'unit/styling-cross-scope-var.html?dom=shadow',
+      'unit/styling-cross-scope-apply.html?dom=shadow',
       'unit/styling-cross-scope-unknown-host.html',
       'unit/custom-style.html',
       'unit/custom-style.html?dom=shadow',
diff --git a/test/unit/custom-style.html b/test/unit/custom-style.html
index fef176d1cd..d04c73403c 100644
--- a/test/unit/custom-style.html
+++ b/test/unit/custom-style.html
@@ -155,7 +155,7 @@
 
   <div class="foo"></div>
 
-  <div class="foo--bar style-scope"></div>
+  <div class="foo--bar"></div>
 
   <dom-module id="x-baz">
     <style>
@@ -489,7 +489,7 @@
       });
 
       test('BEM-like CSS selectors under media queries', function() {
-        assertComputed(document.querySelector('.foo--bar'), '3px');
+        assertComputed(document.querySelector('.foo--bar'), '20px');
       });
 
     });