Add EME permission test to WebViewLayoutTest

android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java

Index: android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java
diff --git a/android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java b/android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java
index 93b0029db2ff367d3af4c0dc98ba3a33aad55a1c..21bf7b64a661fbef948b85d146355fcd55314390 100644
--- a/android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java
+++ b/android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java
@@ -243,6 +243,14 @@ public class WebViewLayoutTest
                 "blink-apis/battery-status/battery-callback-expected.txt");
     }
 
+    @MediumTest
+    public void testEMEPermission() throws Exception {
+        mTestActivity.setGrantPermission(true);
+        runWebViewLayoutTest("blink-apis/eme/eme.html", "blink-apis/eme/eme-expected.txt");
+        mTestActivity.setGrantPermission(false);
+    }
+
+
     // test helper methods
 
     private void runWebViewLayoutTest(final String fileName, final String fileNameExpected)
@@ -268,7 +276,7 @@ public class WebViewLayoutTest
             Log.i(TAG, "file: " + fileNameExpected + " --> rebaselined, length=" + result.length());
         } else {
             String expected = readFile(fileNameExpected);
-            mTestActivity.waitForFinish(TIMEOUT_SECONDS, TimeUnit.SECONDS);
+            mTestActivity.waitForFinish(100, TimeUnit.SECONDS);

[timvolodine, 2016/04/08 11:15:02]

yes pls revert this to the constant

[Yoland Yan(Google), 2016/04/11 18:15:05]

Done.

             String result = mTestActivity.getTestResult();
             if (noFail && !expected.equals(result)) {
                 ComparisonFailure cf = new ComparisonFailure("Unexpected result", expected, result);