[Android] Switch AwContentsTest to EmbeddedTestServer

android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java
index cbbf8330a57a3fda2b1d538904b3650cf79572c8..75160e04f25a96a825d0cb0c4ac787af375421f8 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java
@@ -19,7 +19,6 @@ import org.chromium.net.test.EmbeddedTestServer;
 
 import java.util.Arrays;
 import java.util.Locale;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
@@ -48,7 +47,6 @@ public class AcceptLanguageTest extends AwTestBase {
 
     private static final Pattern COMMA_AND_OPTIONAL_Q_VALUE =
             Pattern.compile("(?:;q=[^,]+)?(?:,|$)");
-    private static final Pattern MAYBE_QUOTED_STRING = Pattern.compile("^(\"?)(.*)\\1$");
 
     /**
      * Extract the languages from the Accept-Language header.
@@ -67,10 +65,7 @@ public class AcceptLanguageTest extends AwTestBase {
      * @return A list of languages as Strings.
      */
     private String[] getAcceptLanguages(String raw) {
-        assertNotNull(raw);
-        Matcher m = MAYBE_QUOTED_STRING.matcher(raw);
-        assertTrue(m.matches());
-        return COMMA_AND_OPTIONAL_Q_VALUE.split(m.group(2));
+        return COMMA_AND_OPTIONAL_Q_VALUE.split(maybeStripDoubleQuotes(raw));

[shenghuazhang, 2016/12/15 19:09:49]

Refactor by using maybeStripDoubleQuotes. Didn't move method getAcceptLanguages
into AwTestBase, since it is rarely used in other files.

[sgurun-gerrit only, 2016/12/15 19:20:26]

yep, my comment for moving was not for this, either. 

     }
 
     /**