Fix callers of old BrowserLoadURL() to directly use loadShortcutOrURI(aURL). bug=61808, r=blake, a=ben

suite/common/contentAreaClick.js

@@ -164,13 +164,10 @@
 
   function middleMousePaste()
   {
-      var url = readFromClipboard();
+    var url = readFromClipboard();
-      //dump ("Loading URL on clipboard: '" + url + "'; length = " + url.length + "\n");
+    if (url) {
-      if (url) {
+      loadShortcutOrURI(url);
-        var urlBar = document.getElementById("urlbar");
+      return true;
-        urlBar.value = url;
-        BrowserLoadURL();
-        return true;
     }
     return false;
   }

suite/common/contentAreaDD.js

@@ -165,9 +165,7 @@ var contentAreaDNDObserver = {
         return true;
       switch (document.firstChild.getAttribute('windowtype')) {
         case "navigator:browser":
-          var urlBar = document.getElementById("urlbar");
+          loadShortcutOrURI(url);
-          urlBar.value = url;
-          BrowserLoadURL();
           break;
         case "navigator:view-source":
           viewSource(url);