Backed out changeset 16d04cad3cf9 (bug 1563343) for causing failures in test_handlerService_store and same-origin.html CLOSED TREE

--HG--
extra : rebase_source : 68a96d92cf61940c280a9c3da39683b189a8afa9

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/BaseSessionTest.kt

@@ -50,7 +50,6 @@ open class BaseSessionTest(noErrorCollector: Boolean = false) {
         const val VIDEO_WEBM_PATH = "/assets/www/webm.html"
         const val VIDEO_BAD_PATH = "/assets/www/badVideoPath.html"
         const val UNKNOWN_HOST_URI = "http://www.test.invalid/"
-        const val UNKNOWN_PROTOCOL_URI = "htt://invalid"
         const val FULLSCREEN_PATH = "/assets/www/fullscreen.html"
         const val VIEWPORT_PATH = "/assets/www/viewport.html"
         const val IFRAME_REDIRECT_LOCAL = "/assets/www/iframe_redirect_local.html"

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/NavigationDelegateTest.kt

@@ -194,12 +194,6 @@ class NavigationDelegateTest : BaseSessionTest() {
                 WebRequestError.ERROR_SECURITY_BAD_CERT)
     }
 
-    @Test fun loadUnknownProtocol() {
-        testLoadEarlyError(UNKNOWN_PROTOCOL_URI,
-                WebRequestError.ERROR_CATEGORY_URI,
-                WebRequestError.ERROR_UNKNOWN_PROTOCOL)
-    }
-
     @Setting(key = Setting.Key.USE_TRACKING_PROTECTION, value = "true")
     @Ignore // TODO: Bug 1564373
     @Test fun trackingProtection() {

uriloader/exthandler/android/nsExternalURLHandlerService.cpp

@@ -15,12 +15,6 @@ nsExternalURLHandlerService::~nsExternalURLHandlerService() {}
 NS_IMETHODIMP
 nsExternalURLHandlerService::GetURLHandlerInfoFromOS(nsIURI* aURL, bool* found,
                                                      nsIHandlerInfo** info) {
-  if (!mozilla::jni::IsFennec()) {
-    // We don't want to get protocol handlers from the OS in GV; the app
-    // should take care of that in onLoadRequest.
-    return NS_ERROR_NOT_IMPLEMENTED;
-  }
-
   nsCString uriSpec;
   aURL->GetSpec(uriSpec);
   return nsMIMEInfoAndroid::GetMimeInfoForURL(uriSpec, found, info);

uriloader/exthandler/android/nsOSHelperAppService.cpp

@@ -41,11 +41,6 @@ nsresult nsOSHelperAppService::OSProtocolHandlerExists(const char* aScheme,
 
 nsresult nsOSHelperAppService::GetProtocolHandlerInfoFromOS(
     const nsACString& aScheme, bool* found, nsIHandlerInfo** info) {
-  if (!mozilla::jni::IsFennec()) {
-    // We don't want to get protocol handlers from the OS in GV; the app
-    // should take care of that in onLoadRequest.
-    return NS_ERROR_NOT_IMPLEMENTED;
-  }
   return nsMIMEInfoAndroid::GetMimeInfoForURL(aScheme, found, info);
 }