Bug 1441964 - [1.0] Return URI-load delegation success state instead of throwing. r=snorp

docshell/base/nsDocShell.cpp

@@ -9648,8 +9648,10 @@ nsDocShell::InternalLoad(nsIURI* aURI,
       return NS_ERROR_DOM_INVALID_ACCESS_ERR;
     }
 
-    if (NS_SUCCEEDED(mLoadURIDelegate->LoadURI(aURI, where, aFlags,
-                                               aTriggeringPrincipal))) {
+    bool loadURIHandled = false;
+    rv = mLoadURIDelegate->LoadURI(aURI, where, aFlags, aTriggeringPrincipal,
+                                   &loadURIHandled);
+    if (NS_SUCCEEDED(rv) && loadURIHandled) {
       // The request has been handled, nothing to do here.
       return NS_OK;
     }

mobile/android/chrome/geckoview/GeckoViewNavigationContent.js

@@ -53,9 +53,7 @@ class GeckoViewNavigationContent extends GeckoViewContentModule {
     });
     Services.tm.spinEventLoopUntil(() => handled !== undefined);
 
-    if (!handled) {
-      throw Cr.NS_ERROR_ABORT;
-    }
+    return handled;
   }
 }
 

xpcom/base/nsILoadURIDelegate.idl

@@ -27,7 +27,7 @@ interface nsILoadURIDelegate : nsISupports
    * @param aFlags Flags which control the behavior of the load.
    * @param aTriggeringPrincipal The principal that triggered the load of aURI.
   */
-  void
+  boolean
   loadURI(in nsIURI aURI, in short aWhere, in long aFlags,
           in nsIPrincipal aTriggeringPrincipal);
 };