Merge EmbeddedTestServer#createAndStartDefaultServer() and createAndStartFileServer()

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.java
index 3e31ec0f7642c6079afe5fa82d87dc499913cb00..efe98f320875527677d3f137e769fe62eeb59c26 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/OmniboxTest.java
@@ -6,7 +6,6 @@ package org.chromium.chrome.browser.omnibox;
 
 import static org.chromium.chrome.test.util.OmniboxTestUtils.buildSuggestionMap;
 
-import android.os.Environment;
 import android.os.SystemClock;
 import android.support.v4.view.ViewCompat;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -561,8 +560,8 @@ public class OmniboxTest extends ChromeActivityTestCaseBase<ChromeActivity> {
      */
     @FlakyTest(message = "crbug.com/414353")
     public void testSecurityIcon() throws InterruptedException {
-        EmbeddedTestServer testServer = EmbeddedTestServer.createAndStartFileServer(
-                getInstrumentation().getContext(), Environment.getExternalStorageDirectory());
+        EmbeddedTestServer testServer = EmbeddedTestServer.createAndStartServer(
+                getInstrumentation().getContext());
         try {
             final String testUrl = testServer.getURL("/chrome/test/data/android/omnibox/one.html");
             final String securedExternalUrl = "https://www.google.com";