[SystemWebViewShellLayoutTest] Make testNoUnexpectedInterfaces non-failing.

WebViewLayoutTest.testNoUnexpectedInterfaces fails when new interfaces are
added to webview without updating the expectation files. In practice this
amounts to sheriffs either 'blindly' rebasing the expectation file or just
disabling this test.

This patch makes this test non-failing to be able to catch new interfaces
without annoying the sheriff. Normally new exposed interfaces should be
verified whether they actually work and should be exposed in webview.

BUG=564765

Review URL: https://codereview.chromium.org/1501333004

Cr-Commit-Position: refs/heads/master@{#363505}

1 files changed, 6 insertions, 6 deletions

diff --git a/android_webview/tools/WebViewShellTest/src/org/chromium/webview_shell/test/WebViewLayoutTest.java b/android_webview/tools/WebViewShellTest/src/org/chromium/webview_shell/test/WebViewLayoutTest.java
index 9942776..59ebd81 100644
--- a/android_webview/tools/WebViewShellTest/src/org/chromium/webview_shell/test/WebViewLayoutTest.java
+++ b/android_webview/tools/WebViewShellTest/src/org/chromium/webview_shell/test/WebViewLayoutTest.java
@@ -11,7 +11,6 @@ import android.test.suitebuilder.annotation.MediumTest;
 import junit.framework.ComparisonFailure;
 
 import org.chromium.base.Log;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.webview_shell.WebViewLayoutTestActivity;
 
 import java.io.BufferedReader;
@@ -83,11 +82,9 @@ public class WebViewLayoutTest
                            "webexposed/global-interface-listing-expected.txt", true);
     }
 
-    /*
+    // This is a non-failing test to avoid 'blind' rebaselines by the sheriff
+    // (see crbug.com/564765).
     @MediumTest
-    crbug.com/564765
-    */
-    @DisabledTest
     public void testNoUnexpectedInterfaces() throws Exception {
         ensureJsTestCopied();
         loadUrlWebViewAsync("file://" + PATH_BLINK_PREFIX
@@ -108,7 +105,10 @@ public class WebViewLayoutTest
                 newInterfaces.append(interfaceS + "\n");
             }
         }
-        assertEquals("Unexpected new webview interfaces found", "", newInterfaces.toString());
+
+        if (newInterfaces.length() > 0) {
+            Log.w(TAG, "Unexpected WebView interfaces found: " + newInterfaces.toString());
+        }
     }
 
     @MediumTest