Revert of Removal of geolocation APIs on insecure origins

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview.test;
 
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.webkit.GeolocationPermissions;
 
@@ skipping 105 matching lines @@
     }
 
 
     /**
      * Ensure that a call to navigator.getCurrentPosition works in WebView.
      */
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testGetPosition() throws Throwable {
         initAwContents(new GrantPermisionAwContentClient());
-        loadDataWithBaseUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), RAW_HTML,
-                "text/html", false, "https://google.com/", "about:blank");
+        loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+                RAW_HTML, "text/html", false);
 
         mAwContents.evaluateJavaScriptForTests("initiate_getCurrentPosition();", null);
 
         poll(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return getPositionCountFromJS() == 1;
             }
         });
 
         mAwContents.evaluateJavaScriptForTests("initiate_getCurrentPosition();", null);
         poll(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return getPositionCountFromJS() == 2;
             }
         });
     }
 
     /**
      * Ensure that a call to navigator.watchPosition works in WebView.
      */
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testWatchPosition() throws Throwable {
         initAwContents(new GrantPermisionAwContentClient());
-        loadDataWithBaseUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), RAW_HTML,
-                "text/html", false, "https://google.com/", "about:blank");
+        loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+                RAW_HTML, "text/html", false);
 
         mAwContents.evaluateJavaScriptForTests("initiate_watchPosition();", null);
 
         poll(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return getPositionCountFromJS() > 1;
             }
         });
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testPauseGeolocationOnPause() throws Throwable {
         initAwContents(new GrantPermisionAwContentClient());
         // Start a watch going.
-        loadDataWithBaseUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), RAW_HTML,
-                "text/html", false, "https://google.com/", "about:blank");
+        loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+                RAW_HTML, "text/html", false);
 
         mAwContents.evaluateJavaScriptForTests("initiate_watchPosition();", null);
 
         poll(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return getPositionCountFromJS() > 1;
             }
         });
 
@@ skipping 37 matching lines @@
     public void testPauseAwContentsBeforeNavigating() throws Throwable {
         initAwContents(new GrantPermisionAwContentClient());
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 mAwContents.onPause();
             }
         });
 
         // Start a watch going.
-        loadDataWithBaseUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), RAW_HTML,
-                "text/html", false, "https://google.com/", "about:blank");
+        loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+                RAW_HTML, "text/html", false);
 
         mAwContents.evaluateJavaScriptForTests("initiate_watchPosition();", null);
 
         assertEquals(0, getPositionCountFromJS());
 
         ensureGeolocationRunning(false);
 
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
@@ skipping 15 matching lines @@
     @Feature({"AndroidWebView"})
     public void testResumeWhenNotStarted() throws Throwable {
         initAwContents(new GrantPermisionAwContentClient());
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 mAwContents.onPause();
             }
         });
 
-        loadDataWithBaseUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), RAW_HTML,
-                "text/html", false, "https://google.com/", "about:blank");
+        loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+                RAW_HTML, "text/html", false);
 
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 mAwContents.onResume();
             }
         });
 
         ensureGeolocationRunning(false);
     }
 
     @Feature({"AndroidWebView"})
     @SmallTest
     public void testDenyAccessByDefault() throws Throwable {
         initAwContents(new DefaultPermisionAwContentClient());
-        loadDataWithBaseUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), RAW_HTML,
-                "text/html", false, "https://google.com/", "about:blank");
+        loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
+                RAW_HTML, "text/html", false);
 
         mAwContents.evaluateJavaScriptForTests("initiate_getCurrentPosition();", null);
 
         poll(new Callable<Boolean>() {
             @SuppressFBWarnings("DM_GC")
             @Override
             public Boolean call() throws Exception {
                 Runtime.getRuntime().gc();
                 return "deny".equals(getTitleOnUiThread(mAwContents));
             }
         });
     }
 
 }