Bug 590476 - bustage-fix [r=mbrubeck]

mobile/chrome/content/bindings/browser.xml

@@ -103,6 +103,8 @@
               this.onPageShow(aMessage);
 
               if (this.mIconURL == "" && this._documentURI) {
+                // newURI call is throwing for chrome URI
+                try {
                   // Use documentURIObject in the favicon construction so that we
                   // do the right thing with about:-style error pages.  Bug 515188
                   let iconURI = Services.io.newURI(this.documentURI.prePath + "/favicon.ico", null, null);
@@ -111,6 +113,8 @@
                     this.mIconURL = iconURI.spec;
                   }
                 }
+                catch(e) {}
+              }
               break;
 
             case "pagehide":

mobile/chrome/content/browser-ui.js

@@ -943,7 +943,7 @@ var BrowserUI = {
         this._edit.blur();
 
         MenuListHelperUI.show({
-          title: "TTTTTTTTTTTTTTTTTTTTTTTTTTEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEESSSSSSSSSSSSSSSSSTTTTTTTTTTTT" || Elements.browserBundle.getString("opensearch.searchWith"),
+          title: Elements.browserBundle.getString("opensearch.searchWith"),
           menupopup: { children: BrowserSearch.engines },
           set selectedIndex(aIndex) {
             let name = this.menupopup.children[aIndex].label;