--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -288,17 +288,17 @@
                 accesskey="&selectAllCmd.accesskey;"
                 command="cmd_selectAll"/>
       <menuseparator id="context-sep-selectall"/>
       <menuitem id="context-keywordfield"
                 label="&keywordfield.label;"
                 accesskey="&keywordfield.accesskey;"
                 oncommand="AddKeywordForSearchField();"/>
       <menuitem id="context-searchselect"
-                oncommand="BrowserSearch.loadSearchFromContext(getBrowserSelection());"/>
+                oncommand="BrowserSearch.loadSearchFromContext(this.searchTerms);"/>
       <menuitem id="context-shareselect"
                 label="&shareSelectCmd.label;"
                 accesskey="&shareSelectCmd.accesskey;"
                 oncommand="gContextMenu.shareSelect(getBrowserSelection());"/>
       <menuseparator id="frame-sep"/>
       <menu id="frame" label="&thisFrameMenu.label;" accesskey="&thisFrameMenu.accesskey;">
         <menupopup>
           <menuitem id="context-showonlythisframe"

--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -27,17 +27,17 @@ nsContextMenu.prototype = {
     }
 
     this.isFrameImage = document.getElementById("isFrameImage");
     this.ellipsis = "\u2026";
     try {
       this.ellipsis = gPrefService.getComplexValue("intl.ellipsis",
                                                    Ci.nsIPrefLocalizedString).data;
     } catch (e) { }
-    this.isTextSelected = this.isTextSelection();
+
     this.isContentSelected = this.isContentSelection();
     this.onPlainTextLink = false;
 
     // Initialize (disable/remove) menu items.
     this.initItems();
   },
 
   hiding: function CM_hiding() {
@@ -263,41 +263,44 @@ nsContextMenu.prototype = {
     document.getElementById("context-viewbgimage")
             .disabled = !this.hasBGImage;
 
     this.showItem("context-viewimageinfo", this.onImage);
     this.showItem("context-viewimagedesc", this.onImage && this.imageDescURL !== "");
   },
 
   initMiscItems: function CM_initMiscItems() {
-    var isTextSelected = this.isTextSelected;
-
     // Use "Bookmark This Link" if on a link.
     this.showItem("context-bookmarkpage",
                   !(this.isContentSelected || this.onTextInput || this.onLink ||
                     this.onImage || this.onVideo || this.onAudio || this.onSocial));
     this.showItem("context-bookmarklink", (this.onLink && !this.onMailtoLink &&
                                            !this.onSocial) || this.onPlainTextLink);
-    this.showItem("context-searchselect", isTextSelected);
     this.showItem("context-keywordfield",
                   this.onTextInput && this.onKeywordField);
     this.showItem("frame", this.inFrame);
 
+    let showSearchSelect = (this.isTextSelected || this.onLink) && !this.onImage;
+    this.showItem("context-searchselect", showSearchSelect);
+    if (showSearchSelect) {
+      this.formatSearchContextItem();
+    }
+
     // srcdoc cannot be opened separately due to concerns about web
     // content with about:srcdoc in location bar masquerading as trusted
     // chrome/addon content.
     // No need to also test for this.inFrame as this is checked in the parent
     // submenu.
     this.showItem("context-showonlythisframe", !this.inSrcdocFrame);
     this.showItem("context-openframeintab", !this.inSrcdocFrame);
     this.showItem("context-openframe", !this.inSrcdocFrame);
     this.showItem("context-bookmarkframe", !this.inSrcdocFrame);
     this.showItem("open-frame-sep", !this.inSrcdocFrame);
 
-    this.showItem("frame-sep", this.inFrame && isTextSelected);
+    this.showItem("frame-sep", this.inFrame && this.isTextSelected);
 
     // Hide menu entries for images, show otherwise
     if (this.inFrame) {
       if (mimeTypeIsTextBased(this.target.ownerDocument.contentType))
         this.isFrameImage.removeAttribute('hidden');
       else
         this.isFrameImage.setAttribute('hidden', 'true');
     }
@@ -535,16 +538,18 @@ nsContextMenu.prototype = {
     this.inSrcdocFrame     = false;
     this.inSyntheticDoc    = false;
     this.hasBGImage        = false;
     this.bgImageURL        = "";
     this.onEditableArea    = false;
     this.isDesignMode      = false;
     this.onCTPPlugin       = false;
     this.canSpellCheck     = false;
+    this.textSelected      = getBrowserSelection();
+    this.isTextSelected    = this.textSelected.length != 0;
 
     // Remember the node that was clicked.
     this.target = aNode;
 
     // If this is a remote context menu event, use the information from
     // gContextMenuContentData instead.
     if (this.isRemote) {
       this.browser = gContextMenuContentData.browser;
@@ -1437,49 +1442,16 @@ nsContextMenu.prototype = {
         if (!text || !text.match(/\S/))
           text = this.linkURL;
       }
     }
 
     return text;
   },
 
-  // Get selected text. Only display the first 15 chars.
-  isTextSelection: function() {
-    // Get 16 characters, so that we can trim the selection if it's greater
-    // than 15 chars
-    var selectedText = getBrowserSelection(16);
-
-    if (!selectedText)
-      return false;
-
-    if (selectedText.length > 15)
-      selectedText = selectedText.substr(0,15) + this.ellipsis;
-
-    // Use the current engine if the search bar is visible, the default
-    // engine otherwise.
-    var engineName = "";
-    var ss = Cc["@mozilla.org/browser/search-service;1"].
-             getService(Ci.nsIBrowserSearchService);
-    if (isElementVisible(BrowserSearch.searchBar))
-      engineName = ss.currentEngine.name;
-    else
-      engineName = ss.defaultEngine.name;
-
-    // format "Search <engine> for <selection>" string to show in menu
-    var menuLabel = gNavigatorBundle.getFormattedString("contextMenuSearch",
-                                                        [engineName,
-                                                         selectedText]);
-    document.getElementById("context-searchselect").label = menuLabel;
-    document.getElementById("context-searchselect").accessKey =
-             gNavigatorBundle.getString("contextMenuSearch.accesskey"); 
-
-    return true;
-  },
-
   // Returns true if anything is selected.
   isContentSelection: function() {
     return !document.commandDispatcher.focusedWindow.getSelection().isCollapsed;
   },
 
   toString: function () {
     return "contextMenu.target     = " + this.target + "\n" +
            "contextMenu.onImage    = " + this.onImage + "\n" +
@@ -1683,10 +1655,39 @@ nsContextMenu.prototype = {
                     getService(Ci.nsIClipboardHelper);
     clipboard.copyString(this.mediaURL, document);
   },
 
   get imageURL() {
     if (this.onImage)
       return this.mediaURL;
     return "";
+  },
+
+  // Formats the 'Search <engine> for "<selection or link text>"' context menu.
+  formatSearchContextItem: function() {
+    var menuItem = document.getElementById("context-searchselect");
+    var selectedText = this.onLink ? this.linkText() : this.textSelected;
+
+    // Store searchTerms in context menu item so we know what to search onclick
+    menuItem.searchTerms = selectedText;
+
+    if (selectedText.length > 15)
+      selectedText = selectedText.substr(0,15) + this.ellipsis;
+
+    // Use the current engine if the search bar is visible, the default
+    // engine otherwise.
+    var engineName = "";
+    var ss = Cc["@mozilla.org/browser/search-service;1"].
+             getService(Ci.nsIBrowserSearchService);
+    if (isElementVisible(BrowserSearch.searchBar))
+      engineName = ss.currentEngine.name;
+    else
+      engineName = ss.defaultEngine.name;
+
+    // format "Search <engine> for <selection>" string to show in menu
+    var menuLabel = gNavigatorBundle.getFormattedString("contextMenuSearch",
+                                                        [engineName,
+                                                         selectedText]);
+    menuItem.label = menuLabel;
+    menuItem.accessKey = gNavigatorBundle.getString("contextMenuSearch.accesskey");
   }
 };

--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -4,16 +4,17 @@ support-files =
   accounts_testRemoteCommands.html
   alltabslistener.html
   app_bug575561.html
   app_subframe_bug575561.html
   authenticate.sjs
   browser_bug479408_sample.html
   browser_bug678392-1.html
   browser_bug678392-2.html
+  browser_bug970746.xhtml
   browser_registerProtocolHandler_notification.html
   browser_star_hsts.sjs
   browser_tab_dragdrop2_frame1.xul
   bug564387.html
   bug564387_video1.ogv
   bug564387_video1.ogv^headers^
   bug592338.html
   bug792517-2.html
@@ -197,16 +198,17 @@ skip-if = os == "mac" # Intermittent fai
 [browser_bug817947.js]
 [browser_bug822367.js]
 [browser_bug832435.js]
 [browser_bug839103.js]
 [browser_bug880101.js]
 [browser_bug882977.js]
 [browser_bug902156.js]
 [browser_bug906190.js]
+[browser_bug970746.js]
 [browser_canonizeURL.js]
 [browser_contentAreaClick.js]
 [browser_contextSearchTabPosition.js]
 skip-if = os == "mac" # bug 967013, bug 926729
 [browser_ctrlTab.js]
 [browser_customize_popupNotification.js]
 [browser_datareporting_notification.js]
 run-if = datareporting

new file mode 100644
--- /dev/null
+++ b/browser/base/content/test/general/browser_bug970746.js
@@ -0,0 +1,104 @@
+/* Make sure context menu includes option to search hyperlink text on search engine */
+
+function test() {
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    let doc = gBrowser.contentDocument;
+    let contentAreaContextMenu = document.getElementById("contentAreaContextMenu");
+    let ellipsis = "\u2026";
+
+    // Tests if the "Search <engine> for '<some terms>'" context menu item is shown for the
+    // given query string of an element. Tests to make sure label includes the proper search terms.
+    //
+    // Options:
+    // 
+    //   id: The id of the element to test.
+    //   isSelected: Flag to enable selection (text hilight) the contents of the element
+    //   shouldBeShown: The display state of the menu item
+    //   expectedLabelContents: The menu item label should contain a portion of this string.
+    //                          Will only be tested if shouldBeShown is true.
+
+    let testElement = function(opts) {
+      let element = doc.getElementById(opts.id);
+      document.popupNode = element;
+
+      let selection = content.getSelection();
+      selection.removeAllRanges();
+
+      if(opts.isSelected) {
+        selection.selectAllChildren(element);
+      }
+
+      let contextMenu = new nsContextMenu(contentAreaContextMenu);
+      let menuItem = document.getElementById("context-searchselect");
+
+      is(document.getElementById("context-searchselect").hidden, !opts.shouldBeShown, "search context menu item is shown for  '#" + opts.id + "' and selected is '" + opts.isSelected + "'");
+
+      if(opts.shouldBeShown) {
+        ok(menuItem.label.contains(opts.expectedLabelContents), "Menu item text '" + menuItem.label  + "' contains the correct search terms '" + opts.expectedLabelContents  + "'");
+      }
+    }
+
+    testElement({
+      id: "link",
+      isSelected: true,
+      shouldBeShown: true,
+      expectedLabelContents: "I'm a link!",
+    });
+    testElement({
+      id: "link",
+      isSelected: false,
+      shouldBeShown: true,
+      expectedLabelContents: "I'm a link!",
+    });
+
+    testElement({
+      id: "longLink",
+      isSelected: true,
+      shouldBeShown: true,
+      expectedLabelContents: "I'm a really lo" + ellipsis,
+    });
+    testElement({
+      id: "longLink",
+      isSelected: false,
+      shouldBeShown: true,
+      expectedLabelContents: "I'm a really lo" + ellipsis,
+    });
+
+    testElement({
+      id: "plainText",
+      isSelected: true,
+      shouldBeShown: true,
+      expectedLabelContents: "Right clicking " + ellipsis,
+    });
+    testElement({
+      id: "plainText",
+      isSelected: false,
+      shouldBeShown: false,
+    });
+
+    testElement({
+      id: "mixedContent",
+      isSelected: true,
+      shouldBeShown: true,
+      expectedLabelContents: "I'm some text, " + ellipsis,
+    });
+    testElement({
+      id: "mixedContent",
+      isSelected: false,
+      shouldBeShown: false,
+    });
+
+    // cleanup
+    document.popupNode = null;
+    gBrowser.removeCurrentTab();
+    finish();
+  }, true);
+
+  content.location = "http://mochi.test:8888/browser/browser/base/content/test/general/browser_bug970746.xhtml";
+}
\ No newline at end of file

new file mode 100644
--- /dev/null
+++ b/browser/base/content/test/general/browser_bug970746.xhtml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<body>
+		<a href="http://mozilla.org" id="link">I'm a link!</a>
+		<a href="http://mozilla.org" id="longLink">I'm a really long link and I should be truncated.</a>
+
+		<span id="plainText">
+			Right clicking me when I'm selected should show the menu item.
+		</span>
+		<span id="mixedContent">
+			I'm some text, and <a href="http://mozilla.org">I'm a link!</a>
+		</span>
+	</body>
+</html>
\ No newline at end of file

--- a/browser/base/content/test/general/test_contextmenu.html
+++ b/browser/base/content/test/general/test_contextmenu.html
@@ -113,34 +113,38 @@ function runTest(testNum) {
         // Context menu for text link
         if (perWindowPrivateBrowsing) {
           checkContextMenu(["context-openlinkintab", true,
                             "context-openlink",      true,
                             "context-openlinkprivate", true,
                             "---",                   null,
                             "context-bookmarklink",  true,
                             "context-savelink",      true,
-                            "context-copylink",      true
+                            "context-copylink",      true,
+                            "context-searchselect",  true
                            ].concat(inspectItems));
         } else {
           checkContextMenu(["context-openlinkintab", true,
                             "context-openlink",      true,
                             "---",                   null,
                             "context-bookmarklink",  true,
                             "context-savelink",      true,
-                            "context-copylink",      true
+                            "context-copylink",      true,
+                            "context-searchselect",  true
                            ].concat(inspectItems));
         }
         closeContextMenu();
         openContextMenuFor(mailto); // Invoke context menu for next test.
         break;
 
     case 4:
         // Context menu for text mailto-link
-        checkContextMenu(["context-copyemail", true].concat(inspectItems));
+        checkContextMenu(["context-copyemail", true,
+                          "context-searchselect", true
+                        ].concat(inspectItems));
         closeContextMenu();
         openContextMenuFor(img); // Invoke context menu for next test.
         break;
 
     case 5:
         // Context menu for an image
         checkContextMenu(["context-viewimage",            true,
                           "context-copyimage-contents",   true,

--- a/browser/components/distribution.js
+++ b/browser/components/distribution.js
@@ -162,17 +162,17 @@ DistributionCustomizer.prototype = {
           index = prependIndex++;
 
         // Don't bother updating the livemark contents on creation.
         PlacesUtils.livemarks.addLivemark({ title: items[iid]["title"]
                                           , parentId: parentId
                                           , index: index
                                           , feedURI: this._makeURI(items[iid]["feedLink"])
                                           , siteURI: this._makeURI(items[iid]["siteLink"])
-                                          });
+                                          }).then(null, Cu.reportError);
         break;
 
       case "bookmark":
       default:
         if (iid < defaultItemId)
           index = prependIndex++;
 
         newId = PlacesUtils.bookmarks.insertBookmark(parentId,

--- a/browser/components/places/content/bookmarkProperties.js
+++ b/browser/components/places/content/bookmarkProperties.js
@@ -246,34 +246,30 @@ var BookmarkPropertiesPanel = {
           // Load In Sidebar
           this._loadInSidebar = PlacesUtils.annotations
                                            .itemHasAnnotation(this._itemId,
                                                               PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO);
           break;
 
         case "folder":
           this._itemType = BOOKMARK_FOLDER;
-          PlacesUtils.livemarks.getLivemark(
-            { id: this._itemId },
-            (function (aStatus, aLivemark) {
-              if (Components.isSuccessCode(aStatus)) {
-                this._itemType = LIVEMARK_CONTAINER;
-                this._feedURI = aLivemark.feedURI;
-                this._siteURI = aLivemark.siteURI;
-                this._fillEditProperties();
+          PlacesUtils.livemarks.getLivemark({ id: this._itemId })
+            .then(aLivemark => {
+              this._itemType = LIVEMARK_CONTAINER;
+              this._feedURI = aLivemark.feedURI;
+              this._siteURI = aLivemark.siteURI;
+              this._fillEditProperties();
 
-                let acceptButton = document.documentElement.getButton("accept");
-                acceptButton.disabled = !this._inputIsValid();
+              let acceptButton = document.documentElement.getButton("accept");
+              acceptButton.disabled = !this._inputIsValid();
 
-                let newHeight = window.outerHeight +
-                                this._element("descriptionField").boxObject.height;
-                window.resizeTo(window.outerWidth, newHeight);
-              }
-            }).bind(this)
-          );
+              let newHeight = window.outerHeight +
+                              this._element("descriptionField").boxObject.height;
+              window.resizeTo(window.outerWidth, newHeight);
+            }, () => undefined);
 
           break;
       }
 
       // Description
       if (PlacesUtils.annotations
                      .itemHasAnnotation(this._itemId, PlacesUIUtils.DESCRIPTION_ANNO)) {
         this._description = PlacesUtils.annotations

--- a/browser/components/places/content/browserPlacesViews.js
+++ b/browser/components/places/content/browserPlacesViews.js
@@ -312,31 +312,27 @@ PlacesViewBase.prototype = {
           if (PlacesUtils.nodeIsTagQuery(aPlacesNode))
             element.setAttribute("tagContainer", "true");
           else if (PlacesUtils.nodeIsDay(aPlacesNode))
             element.setAttribute("dayContainer", "true");
           else if (PlacesUtils.nodeIsHost(aPlacesNode))
             element.setAttribute("hostContainer", "true");
         }
         else if (itemId != -1) {
-          PlacesUtils.livemarks.getLivemark(
-            { id: itemId },
-            function (aStatus, aLivemark) {
-              if (Components.isSuccessCode(aStatus)) {
-                element.setAttribute("livemark", "true");
+          PlacesUtils.livemarks.getLivemark({ id: itemId })
+            .then(aLivemark => {
+              element.setAttribute("livemark", "true");
 #ifdef XP_MACOSX
-                // OS X native menubar doesn't track list-style-images since
-                // it doesn't have a frame (bug 733415).  Thus enforce updating.
-                element.setAttribute("image", "");
-                element.removeAttribute("image");
+              // OS X native menubar doesn't track list-style-images since
+              // it doesn't have a frame (bug 733415).  Thus enforce updating.
+              element.setAttribute("image", "");
+              element.removeAttribute("image");
 #endif
-                this.controller.cacheLivemarkInfo(aPlacesNode, aLivemark);
-              }
-            }.bind(this)
-          );
+              this.controller.cacheLivemarkInfo(aPlacesNode, aLivemark);
+            }, () => undefined);
         }
 
         let popup = document.createElement("menupopup");
         popup._placesNode = PlacesUtils.asContainer(aPlacesNode);
 
         if (!this._nativeView) {
           popup.setAttribute("placespopup", "true");
         }
@@ -504,26 +500,22 @@ PlacesViewBase.prototype = {
 #ifdef XP_MACOSX
         // OS X native menubar doesn't track list-style-images since
         // it doesn't have a frame (bug 733415).  Thus enforce updating.
         menu.setAttribute("image", "");
         menu.removeAttribute("image");
 #endif
       }
 
-      PlacesUtils.livemarks.getLivemark(
-        { id: aPlacesNode.itemId },
-        function (aStatus, aLivemark) {
-          if (Components.isSuccessCode(aStatus)) {
-            // Controller will use this to build the meta data for the node.
-            this.controller.cacheLivemarkInfo(aPlacesNode, aLivemark);
-            this.invalidateContainer(aPlacesNode);
-          }
-        }.bind(this)
-      );
+      PlacesUtils.livemarks.getLivemark({ id: aPlacesNode.itemId })
+        .then(aLivemark => {
+          // Controller will use this to build the meta data for the node.
+          this.controller.cacheLivemarkInfo(aPlacesNode, aLivemark);
+          this.invalidateContainer(aPlacesNode);
+        }, () => undefined);
     }
   },
 
   nodeTitleChanged:
   function PVB_nodeTitleChanged(aPlacesNode, aNewTitle) {
     let elt = this._getDOMNodeForPlacesNode(aPlacesNode);
 
     // There's no UI representation for the root node, thus there's
@@ -642,69 +634,65 @@ PlacesViewBase.prototype = {
       this.invalidateContainer(aPlacesNode);
 
       if (PlacesUtils.nodeIsFolder(aPlacesNode)) {
         let queryOptions = PlacesUtils.asQuery(this._result.root).queryOptions;
         if (queryOptions.excludeItems) {
           return;
         }
 
-        PlacesUtils.livemarks.getLivemark({ id: aPlacesNode.itemId },
-          function (aStatus, aLivemark) {
-            if (Components.isSuccessCode(aStatus)) {
-              let shouldInvalidate =
-                !this.controller.hasCachedLivemarkInfo(aPlacesNode);
-              this.controller.cacheLivemarkInfo(aPlacesNode, aLivemark);
-              if (aNewState == Ci.nsINavHistoryContainerResultNode.STATE_OPENED) {
-                aLivemark.registerForUpdates(aPlacesNode, this);
-                // Prioritize the current livemark.
-                aLivemark.reload();
-                PlacesUtils.livemarks.reloadLivemarks();
-                if (shouldInvalidate)
-                  this.invalidateContainer(aPlacesNode);
-              }
-              else {
-                aLivemark.unregisterForUpdates(aPlacesNode);
-              }
+        PlacesUtils.livemarks.getLivemark({ id: aPlacesNode.itemId })
+          .then(aLivemark => {
+            let shouldInvalidate =
+              !this.controller.hasCachedLivemarkInfo(aPlacesNode);
+            this.controller.cacheLivemarkInfo(aPlacesNode, aLivemark);
+            if (aNewState == Ci.nsINavHistoryContainerResultNode.STATE_OPENED) {
+              aLivemark.registerForUpdates(aPlacesNode, this);
+              // Prioritize the current livemark.
+              aLivemark.reload();
+              PlacesUtils.livemarks.reloadLivemarks();
+              if (shouldInvalidate)
+                this.invalidateContainer(aPlacesNode);
             }
-          }.bind(this)
-        );
+            else {
+              aLivemark.unregisterForUpdates(aPlacesNode);
+            }
+          }, () => undefined);
       }
     }
   },
 
   _populateLivemarkPopup: function PVB__populateLivemarkPopup(aPopup)
   {
     this._setLivemarkSiteURIMenuItem(aPopup);
     // Show the loading status only if there are no entries yet.
     if (aPopup._startMarker.nextSibling == aPopup._endMarker)
       this._setLivemarkStatusMenuItem(aPopup, Ci.mozILivemark.STATUS_LOADING);
 
-    PlacesUtils.livemarks.getLivemark({ id: aPopup._placesNode.itemId },
-      function (aStatus, aLivemark) {
+    PlacesUtils.livemarks.getLivemark({ id: aPopup._placesNode.itemId })
+      .then(aLivemark => {
         let placesNode = aPopup._placesNode;
-        if (!Components.isSuccessCode(aStatus) || !placesNode.containerOpen)
+        if (!placesNode.containerOpen)
           return;
 
         if (aLivemark.status != Ci.mozILivemark.STATUS_LOADING)
           this._setLivemarkStatusMenuItem(aPopup, aLivemark.status);
         this._cleanPopup(aPopup,
           this._nativeView && aPopup.parentNode.hasAttribute("open"));
 
         let children = aLivemark.getNodesForContainer(placesNode);
         for (let i = 0; i < children.length; i++) {
           let child = children[i];
           this.nodeInserted(placesNode, child, i);
           if (child.accessCount)
             this._getDOMNodeForPlacesNode(child).setAttribute("visited", true);
           else
             this._getDOMNodeForPlacesNode(child).removeAttribute("visited");
         }
-      }.bind(this)
-    );
+      }, Components.utils.reportError);
   },
 
   invalidateContainer: function PVB_invalidateContainer(aPlacesNode) {
     let elt = this._getDOMNodeForPlacesNode(aPlacesNode);
     elt._built = false;
 
     // If the menupopup is open we should live-update it.
     if (elt.parentNode.open)
@@ -1003,25 +991,21 @@ PlacesToolbar.prototype = {
         button.setAttribute("container", "true");
 
         if (PlacesUtils.nodeIsQuery(aChild)) {
           button.setAttribute("query", "true");
           if (PlacesUtils.nodeIsTagQuery(aChild))
             button.setAttribute("tagContainer", "true");
         }
         else if (PlacesUtils.nodeIsFolder(aChild)) {
-          PlacesUtils.livemarks.getLivemark(
-            { id: aChild.itemId },
-            function (aStatus, aLivemark) {
-              if (Components.isSuccessCode(aStatus)) {
-                button.setAttribute("livemark", "true");
-                this.controller.cacheLivemarkInfo(aChild, aLivemark);
-              }
-            }.bind(this)
-          );
+          PlacesUtils.livemarks.getLivemark({ id: aChild.itemId })
+            .then(aLivemark => {
+              button.setAttribute("livemark", "true");
+              this.controller.cacheLivemarkInfo(aChild, aLivemark);
+            }, () => undefined);
         }
 
         let popup = document.createElement("menupopup");
         popup.setAttribute("placespopup", "true");
         button.appendChild(popup);
         popup._placesNode = PlacesUtils.asContainer(aChild);
         popup.setAttribute("context", "placesContext");
 
@@ -1263,25 +1247,21 @@ PlacesToolbar.prototype = {
 
     if (elt.parentNode == this._rootElt) {
       // Node is on the toolbar.
 
       // All livemarks have a feedURI, so use it as our indicator.
       if (aAnno == PlacesUtils.LMANNO_FEEDURI) {
         elt.setAttribute("livemark", true);
 
-        PlacesUtils.livemarks.getLivemark(
-          { id: aPlacesNode.itemId },
-          function (aStatus, aLivemark) {
-            if (Components.isSuccessCode(aStatus)) {
-              this.controller.cacheLivemarkInfo(aPlacesNode, aLivemark);
-              this.invalidateContainer(aPlacesNode);
-            }
-          }.bind(this)
-        );
+        PlacesUtils.livemarks.getLivemark({ id: aPlacesNode.itemId })
+          .then(aLivemark => {
+            this.controller.cacheLivemarkInfo(aPlacesNode, aLivemark);
+            this.invalidateContainer(aPlacesNode);
+          }, Components.utils.reportError);
       }
     }
     else {
       // Node is in a submenu.
       PlacesViewBase.prototype.nodeAnnotationChanged.apply(this, arguments);
     }
   },
 
@@ -1835,25 +1815,21 @@ PlacesPanelMenuView.prototype = {
         button.setAttribute("container", "true");
 
         if (PlacesUtils.nodeIsQuery(aChild)) {
           button.setAttribute("query", "true");
           if (PlacesUtils.nodeIsTagQuery(aChild))
             button.setAttribute("tagContainer", "true");
         }
         else if (PlacesUtils.nodeIsFolder(aChild)) {
-          PlacesUtils.livemarks.getLivemark(
-            { id: aChild.itemId },
-            function (aStatus, aLivemark) {
-              if (Components.isSuccessCode(aStatus)) {
-                button.setAttribute("livemark", "true");
-                this.controller.cacheLivemarkInfo(aChild, aLivemark);
-              }
-            }.bind(this)
-          );
+          PlacesUtils.livemarks.getLivemark({ id: aChild.itemId })
+            .then(aLivemark => {
+              button.setAttribute("livemark", "true");
+              this.controller.cacheLivemarkInfo(aChild, aLivemark);
+            }, () => undefined);
         }
       }
       else if (PlacesUtils.nodeIsURI(aChild)) {
         button.setAttribute("scheme",
                             PlacesUIUtils.guessUrlSchemeForUI(aChild.uri));
       }
     }
 
@@ -1907,25 +1883,21 @@ PlacesPanelMenuView.prototype = {
 
     if (elt.parentNode != this._rootElt)
       return;
 
     // All livemarks have a feedURI, so use it as our indicator.
     if (aAnno == PlacesUtils.LMANNO_FEEDURI) {
       elt.setAttribute("livemark", true);
 
-      PlacesUtils.livemarks.getLivemark(
-        { id: aPlacesNode.itemId },
-        function (aStatus, aLivemark) {
-          if (Components.isSuccessCode(aStatus)) {
-            this.controller.cacheLivemarkInfo(aPlacesNode, aLivemark);
-            this.invalidateContainer(aPlacesNode);
-          }
-        }.bind(this)
-      );
+      PlacesUtils.livemarks.getLivemark({ id: aPlacesNode.itemId })
+        .then(aLivemark => {
+          this.controller.cacheLivemarkInfo(aPlacesNode, aLivemark);
+          this.invalidateContainer(aPlacesNode);
+        }, Components.utils.reportError);
     }
   },
 
   nodeTitleChanged: function PAMV_nodeTitleChanged(aPlacesNode, aNewTitle) {
     let elt = this._getDOMNodeForPlacesNode(aPlacesNode);
 
     // There's no UI representation for the root node.
     if (elt == this._rootElt)

--- a/browser/components/places/content/controller.js
+++ b/browser/components/places/content/controller.js
@@ -689,24 +689,20 @@ PlacesController.prototype = {
 
   /**
    * Reloads the selected livemark if any.
    */
   reloadSelectedLivemark: function PC_reloadSelectedLivemark() {
     var selectedNode = this._view.selectedNode;
     if (selectedNode) {
       let itemId = selectedNode.itemId;
-      PlacesUtils.livemarks.getLivemark(
-        { id: itemId },
-        (function(aStatus, aLivemark) {
-          if (Components.isSuccessCode(aStatus)) {
-            aLivemark.reload(true);
-          }
-        }).bind(this)
-      );
+      PlacesUtils.livemarks.getLivemark({ id: itemId })
+        .then(aLivemark => {
+          aLivemark.reload(true);
+        }, Components.utils.reportError);
     }
   },
 
   /**
    * Opens the links in the selected folder, or the selected links in new tabs.
    */
   openSelectionInTabs: function PC_openLinksInTabs(aEvent) {
     var node = this._view.selectedNode;

--- a/browser/components/places/content/editBookmarkOverlay.js
+++ b/browser/components/places/content/editBookmarkOverlay.js
@@ -142,27 +142,23 @@ var gEditItemOverlay = {
                                        .getKeywordForBookmark(this._itemId));
         this._element("loadInSidebarCheckbox").checked =
           PlacesUtils.annotations.itemHasAnnotation(this._itemId,
                                                     PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO);
       }
       else {
         this._uri = null;
         this._isLivemark = false;
-        PlacesUtils.livemarks.getLivemark(
-          {id: this._itemId },
-          (function (aStatus, aLivemark) {
-            if (Components.isSuccessCode(aStatus)) {
-              this._isLivemark = true;
-              this._initTextField("feedLocationField", aLivemark.feedURI.spec, true);
-              this._initTextField("siteLocationField", aLivemark.siteURI ? aLivemark.siteURI.spec : "", true);
-              this._showHideRows();
-            }
-          }).bind(this)
-        );
+        PlacesUtils.livemarks.getLivemark({id: this._itemId })
+          .then(aLivemark => {
+            this._isLivemark = true;
+            this._initTextField("feedLocationField", aLivemark.feedURI.spec, true);
+            this._initTextField("siteLocationField", aLivemark.siteURI ? aLivemark.siteURI.spec : "", true);
+            this._showHideRows();
+          }, () => undefined);
       }
 
       // folder picker
       this._initFolderMenuList(containerId);
 
       // description field
       this._initTextField("descriptionField", 
                           PlacesUIUtils.getItemDescription(this._itemId));

--- a/browser/components/places/content/places.js
+++ b/browser/components/places/content/places.js
@@ -321,20 +321,23 @@ var PlacesOrganizer = {
     if (view) {
       let selectedNodes = view.selectedNode ?
                           [view.selectedNode] : view.selectedNodes;
       this._fillDetailsPane(selectedNodes);
     }
   },
 
   openFlatContainer: function PO_openFlatContainerFlatContainer(aContainer) {
-    if (aContainer.itemId != -1)
+    if (aContainer.itemId != -1) {
+      PlacesUtils.asContainer(this._places.selectedNode).containerOpen = true;
       this._places.selectItems([aContainer.itemId], false);
-    else if (PlacesUtils.nodeIsQuery(aContainer))
+    }
+    else if (PlacesUtils.nodeIsQuery(aContainer)) {
       this._places.selectPlaceURI(aContainer.uri);
+    }
   },
 
   /**
    * Returns the options associated with the query currently loaded in the
    * main places pane.
    */
   getCurrentOptions: function PO_getCurrentOptions() {
     return PlacesUtils.asQuery(ContentArea.currentView.result.root).queryOptions;

--- a/browser/components/places/content/treeView.js
+++ b/browser/components/places/content/treeView.js
@@ -781,29 +781,29 @@ PlacesTreeView.prototype = {
       let lastModifiedColumn =
         this._findColumnByType(this.COLUMN_TYPE_LASTMODIFIED);
       if (lastModifiedColumn && !lastModifiedColumn.hidden)
         this._tree.invalidateCell(row, lastModifiedColumn);
     }
   },
 
   _populateLivemarkContainer: function PTV__populateLivemarkContainer(aNode) {
-    PlacesUtils.livemarks.getLivemark({ id: aNode.itemId },
-      function (aStatus, aLivemark) {
+    PlacesUtils.livemarks.getLivemark({ id: aNode.itemId })
+      .then(aLivemark => {
         let placesNode = aNode;
         // Need to check containerOpen since getLivemark is async.
-        if (!Components.isSuccessCode(aStatus) || !placesNode.containerOpen)
+        if (!placesNode.containerOpen)
           return;
 
         let children = aLivemark.getNodesForContainer(placesNode);
         for (let i = 0; i < children.length; i++) {
           let child = children[i];
           this.nodeInserted(placesNode, child, i);
         }
-      }.bind(this));
+      }, Components.utils.reportError);
   },
 
   nodeTitleChanged: function PTV_nodeTitleChanged(aNode, aNewTitle) {
     this._invalidateCellValue(aNode, this.COLUMN_TYPE_TITLE);
   },
 
   nodeURIChanged: function PTV_nodeURIChanged(aNode, aNewURI) {
     this._invalidateCellValue(aNode, this.COLUMN_TYPE_URI);
@@ -842,29 +842,25 @@ PlacesTreeView.prototype = {
     this._invalidateCellValue(aNode, this.COLUMN_TYPE_KEYWORD);
   },
 
   nodeAnnotationChanged: function PTV_nodeAnnotationChanged(aNode, aAnno) {
     if (aAnno == PlacesUIUtils.DESCRIPTION_ANNO) {
       this._invalidateCellValue(aNode, this.COLUMN_TYPE_DESCRIPTION);
     }
     else if (aAnno == PlacesUtils.LMANNO_FEEDURI) {
-      PlacesUtils.livemarks.getLivemark(
-        { id: aNode.itemId },
-        function (aStatus, aLivemark) {
-          if (Components.isSuccessCode(aStatus)) {
-            this._controller.cacheLivemarkInfo(aNode, aLivemark);
-            let properties = this._cellProperties.get(aNode);
-            this._cellProperties.set(aNode, properties += " livemark ");
+      PlacesUtils.livemarks.getLivemark({ id: aNode.itemId })
+        .then(aLivemark => {
+          this._controller.cacheLivemarkInfo(aNode, aLivemark);
+          let properties = this._cellProperties.get(aNode);
+          this._cellProperties.set(aNode, properties += " livemark ");
 
-            // The livemark attribute is set as a cell property on the title cell.
-            this._invalidateCellValue(aNode, this.COLUMN_TYPE_TITLE);
-          }
-        }.bind(this)
-      );
+          // The livemark attribute is set as a cell property on the title cell.
+          this._invalidateCellValue(aNode, this.COLUMN_TYPE_TITLE);
+        }, Components.utils.reportError);
     }
   },
 
   nodeDateAddedChanged: function PTV_nodeDateAddedChanged(aNode, aNewValue) {
     this._invalidateCellValue(aNode, this.COLUMN_TYPE_DATEADDED);
   },
 
   nodeLastModifiedChanged:
@@ -878,36 +874,33 @@ PlacesTreeView.prototype = {
 
     if (PlacesUtils.nodeIsFolder(aNode) ||
         (this._flatList && aNode == this._rootNode)) {
       let queryOptions = PlacesUtils.asQuery(this._rootNode).queryOptions;
       if (queryOptions.excludeItems) {
         return;
       }
 
-      PlacesUtils.livemarks.getLivemark({ id: aNode.itemId },
-        function (aStatus, aLivemark) {
-          if (Components.isSuccessCode(aStatus)) {
-            let shouldInvalidate = 
-              !this._controller.hasCachedLivemarkInfo(aNode);
-            this._controller.cacheLivemarkInfo(aNode, aLivemark);
-            if (aNewState == Components.interfaces.nsINavHistoryContainerResultNode.STATE_OPENED) {
-              aLivemark.registerForUpdates(aNode, this);
-              // Prioritize the current livemark.
-              aLivemark.reload();
-              PlacesUtils.livemarks.reloadLivemarks();
-              if (shouldInvalidate)
-                this.invalidateContainer(aNode);
-            }
-            else {
-              aLivemark.unregisterForUpdates(aNode);
-            }
+      PlacesUtils.livemarks.getLivemark({ id: aNode.itemId })
+        .then(aLivemark => {
+          let shouldInvalidate = 
+            !this._controller.hasCachedLivemarkInfo(aNode);
+          this._controller.cacheLivemarkInfo(aNode, aLivemark);
+          if (aNewState == Components.interfaces.nsINavHistoryContainerResultNode.STATE_OPENED) {
+            aLivemark.registerForUpdates(aNode, this);
+            // Prioritize the current livemark.
+            aLivemark.reload();
+            PlacesUtils.livemarks.reloadLivemarks();
+            if (shouldInvalidate)
+              this.invalidateContainer(aNode);
           }
-        }.bind(this)
-      );
+          else {
+            aLivemark.unregisterForUpdates(aNode);
+          }
+        }, () => undefined);
     }
   },
 
   invalidateContainer: function PTV_invalidateContainer(aContainer) {
     NS_ASSERT(this._result, "Need to have a result to update");
     if (!this._tree)
       return;
 
@@ -1169,27 +1162,23 @@ PlacesTreeView.prototype = {
             properties += " hostContainer";
         }
         else if (nodeType == Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER ||
                  nodeType == Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT) {
           if (this._controller.hasCachedLivemarkInfo(node)) {
             properties += " livemark";
           }
           else {
-            PlacesUtils.livemarks.getLivemark(
-              { id: node.itemId },
-              function (aStatus, aLivemark) {
-                if (Components.isSuccessCode(aStatus)) {
-                  this._controller.cacheLivemarkInfo(node, aLivemark);
-                  properties += " livemark";
-                  // The livemark attribute is set as a cell property on the title cell.
-                  this._invalidateCellValue(node, this.COLUMN_TYPE_TITLE);
-                }
-              }.bind(this)
-            );
+            PlacesUtils.livemarks.getLivemark({ id: node.itemId })
+              .then(aLivemark => {
+                this._controller.cacheLivemarkInfo(node, aLivemark);
+                properties += " livemark";
+                // The livemark attribute is set as a cell property on the title cell.
+                this._invalidateCellValue(node, this.COLUMN_TYPE_TITLE);
+              }, () => undefined);
           }
         }
 
         if (itemId != -1) {
           let queryName = PlacesUIUtils.getLeftPaneQueryNameFromId(itemId);
           if (queryName)
             properties += " OrganizerQuery_" + queryName;
         }

--- a/browser/components/places/tests/browser/browser.ini
+++ b/browser/components/places/tests/browser/browser.ini
@@ -42,8 +42,9 @@ skip-if = true
 [browser_toolbar_migration.js]
 [browser_library_batch_delete.js]
 [browser_555547.js]
 [browser_416459_cut.js]
 [browser_library_downloads.js]
 [browser_library_left_pane_select_hierarchy.js]
 [browser_435851_copy_query.js]
 [browser_toolbarbutton_menu_context.js]
+[browser_library_openFlatContainer.js]

new file mode 100644
--- /dev/null
+++ b/browser/components/places/tests/browser/browser_library_openFlatContainer.js
@@ -0,0 +1,42 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/**
+ * Test opening a flat container in the right pane even if its parent in the
+ * left pane is closed.
+ */
+
+add_task(function* () {
+  let folder = PlacesUtils.bookmarks
+                          .createFolder(PlacesUtils.unfiledBookmarksFolderId,
+                                        "Folder",
+                                        PlacesUtils.bookmarks.DEFAULT_INDEX);
+  let bookmark = PlacesUtils.bookmarks
+                            .insertBookmark(folder, NetUtil.newURI("http://example.com/"),
+                                            PlacesUtils.bookmarks.DEFAULT_INDEX,
+                                            "Bookmark");
+
+  let library = yield promiseLibrary("AllBookmarks");
+  registerCleanupFunction(function () {
+    library.close();
+    PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
+  });
+
+  // Select unfiled later, to ensure it's closed.
+  library.PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+  ok(!library.PlacesOrganizer._places.selectedNode.containerOpen,
+     "Unfiled container is closed");
+
+  let folderNode = library.ContentTree.view.view.nodeForTreeIndex(0);
+  is(folderNode.itemId, folder,
+     "Found the expected folder in the right pane");
+  // Select the folder node in the right pane.
+  library.ContentTree.view.selectNode(folderNode);
+
+  synthesizeClickOnSelectedTreeCell(library.ContentTree.view,
+                                    { clickCount: 2 });
+
+  is(library.ContentTree.view.view.nodeForTreeIndex(0).itemId, bookmark,
+     "Found the expected bookmark in the right pane");
+});

--- a/browser/components/places/tests/browser/browser_sidebarpanels_click.js
+++ b/browser/components/places/tests/browser/browser_sidebarpanels_click.js
@@ -114,37 +114,16 @@ function test() {
         // Note that for the history sidebar, the URL itself is not opened,
         // and Places will show the load-js-data-url-error prompt as an alert
         // box, which means that the click actually worked, so it's good enough
         // for the purpose of this test.
       });
     }, true);
   }
 
-  function synthesizeClickOnSelectedTreeCell(aTree) {
-    let tbo = aTree.treeBoxObject;
-    is(tbo.view.selection.count, 1,
-       "The test node should be successfully selected");
-    // Get selection rowID.
-    let min = {}, max = {};
-    tbo.view.selection.getRangeAt(0, min, max);
-    let rowID = min.value;
-    tbo.ensureRowIsVisible(rowID);
-
-    // Calculate the click coordinates.
-    let x = {}, y = {}, width = {}, height = {};
-    tbo.getCoordsForCellItem(rowID, aTree.columns[0], "text",
-                             x, y, width, height);
-    x = x.value + width.value / 2;
-    y = y.value + height.value / 2;
-    // Simulate the click.
-    EventUtils.synthesizeMouse(aTree.body, x, y, {},
-                               aTree.ownerDocument.defaultView);
-  }
-
   function changeSidebarDirection(aDirection) {
     sidebar.contentDocument.documentElement.style.direction = aDirection;
   }
 
   function runNextTest() {
     // Remove eventual tabs created by previous sub-tests.
     while (gBrowser.tabs.length > 1) {
       gBrowser.removeTab(gBrowser.tabContainer.lastChild);

--- a/browser/components/places/tests/browser/head.js
+++ b/browser/components/places/tests/browser/head.js
@@ -1,12 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-Components.utils.import("resource://gre/modules/NetUtil.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
+  "resource://gre/modules/NetUtil.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Promise",
+  "resource://gre/modules/commonjs/sdk/core/promise.js");
 
 // We need to cache this before test runs...
 let cachedLeftPaneFolderIdGetter;
 let (getter = PlacesUIUtils.__lookupGetter__("leftPaneFolderId")) {
   if (!cachedLeftPaneFolderIdGetter && typeof(getter) == "function")
     cachedLeftPaneFolderIdGetter = getter;
 }
 // ...And restore it when test ends.
@@ -177,11 +181,27 @@ function addVisits(aPlaceInfo, aWindow, 
       handleCompletion: function UP_handleCompletion() {
         if (aCallback)
           aCallback();
       }
     }
   );
 }
 
-XPCOMUtils.defineLazyModuleGetter(this, "Promise",
-  "resource://gre/modules/commonjs/sdk/core/promise.js");
-
+function synthesizeClickOnSelectedTreeCell(aTree, aOptions) {
+  let tbo = aTree.treeBoxObject;
+  if (tbo.view.selection.count != 1)
+     throw new Error("The test node should be successfully selected");
+  // Get selection rowID.
+  let min = {}, max = {};
+  tbo.view.selection.getRangeAt(0, min, max);
+  let rowID = min.value;
+  tbo.ensureRowIsVisible(rowID);
+  // Calculate the click coordinates.
+  let x = {}, y = {}, width = {}, height = {};
+  tbo.getCoordsForCellItem(rowID, aTree.columns[0], "text",
+                           x, y, width, height);
+  x = x.value + width.value / 2;
+  y = y.value + height.value / 2;
+  // Simulate the click.
+  EventUtils.synthesizeMouse(aTree.body, x, y, aOptions || {},
+                             aTree.ownerDocument.defaultView);
+}

--- a/browser/devtools/debugger/test/browser_dbg_chrome-create.js
+++ b/browser/devtools/debugger/test/browser_dbg_chrome-create.js
@@ -6,18 +6,18 @@
  */
 
 // Enable logging for this test, bug 860349.
 Services.prefs.setBoolPref("devtools.debugger.log", true);
 
 let gProcess;
 
 function test() {
-  // Windows XP test slaves are terribly slow at this test.
-  requestLongerTimeout(4);
+  // Windows XP and 8.1 test slaves are terribly slow at this test.
+  requestLongerTimeout(5);
 
   initChromeDebugger(aOnClose).then(aProcess => {
     gProcess = aProcess;
 
     info("Starting test...");
     performTest();
   });
 }

--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -212,20 +212,24 @@ toolbarbutton[sdk-button="true"][cui-are
   -moz-box-orient: vertical;
 }
 
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-appearance: none;
   -moz-box-orient: vertical;
   width: calc(@menuPanelButtonWidth@ - 2px);
   height: calc(49px + 2.2em);
-  margin-top: 3px; /* Hack needed to get type=menu-button to properly align vertically. */
   border: 0;
 }
 
+.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-text,
+.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text {
+  margin-top: 2px; /* Hack needed to get the label of type=menu-button aligned with other buttons */
+}
+
 .panel-customization-placeholder-child {
   margin: 6px 0 0;
   padding: 2px 6px;
   border: 1px solid transparent;
 }
 
 .panelUI-grid .toolbarbutton-1[type="menu"] {
   background-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");

--- a/layout/reftests/font-face/reftest.list
+++ b/layout/reftests/font-face/reftest.list
@@ -136,17 +136,17 @@ fails-if(cocoaWidget) fails-if(winWidget
 
 HTTP(..) != 534352-1-extra-cmap-sentinel.html 534352-1-extra-cmap-sentinel-ref.html
 HTTP(..) == bug533251.html bug533251-ref.html
 
 # Bug 875287
 HTTP(..) == font-familiy-whitespace-1.html font-familiy-whitespace-1-ref.html
 HTTP(..) != font-familiy-whitespace-1.html font-familiy-whitespace-1-notref.html
 
-skip-if(B2G) fails-if(Android) HTTP(..) == ivs-1.html ivs-1-ref.html # bug 773482
+skip-if(B2G) HTTP(..) == ivs-1.html ivs-1-ref.html # bug 773482
 
 skip-if(B2G) HTTP(..) == missing-names.html missing-names-ref.html # bug 773482
 
 # Tests for bug 670900 - handling of 404 (not found) error in @font-face URL
 # (using Chunkfive font data returned from a .sjs file)
 HTTP(..) == font-error-404-1.html font-error-404-1-ref.html # HTTP status 404, don't load
 skip-if(B2G) fails-if(Android&&AndroidVersion==17) HTTP(..) == font-error-404-2.html font-error-404-2-ref.html # HTTP status 200, load # bug 773482
 fails-if(Android&&AndroidVersion==17) HTTP(..) != font-error-404-1.html font-error-404-2.html # sanity-check that the results differ

--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -841,8 +841,12 @@ pref("browser.webapps.updateCheckUrl", "
 
 // The mode of home provider syncing.
 // 0: Sync always
 // 1: Sync only when on wifi
 pref("home.sync.updateMode", 0);
 
 // How frequently to check if we should sync home provider data.
 pref("home.sync.checkIntervalSecs", 3600);
+
+#ifdef NIGHTLY_BUILD
+pref("devtools.debugger.remote-enabled", true);
+#endif

--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -37,17 +37,16 @@ import org.mozilla.gecko.home.BrowserSea
 import org.mozilla.gecko.home.HomeBanner;
 import org.mozilla.gecko.home.HomeConfigInvalidator;
 import org.mozilla.gecko.home.HomePager;
 import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
 import org.mozilla.gecko.home.SearchEngine;
 import org.mozilla.gecko.menu.GeckoMenu;
 import org.mozilla.gecko.preferences.GeckoPreferences;
 import org.mozilla.gecko.prompts.Prompt;
-import org.mozilla.gecko.prompts.PromptListItem;
 import org.mozilla.gecko.sync.setup.SyncAccounts;
 import org.mozilla.gecko.toolbar.AutocompleteHandler;
 import org.mozilla.gecko.toolbar.BrowserToolbar;
 import org.mozilla.gecko.util.Clipboard;
 import org.mozilla.gecko.util.GamepadUtils;
 import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.util.MenuUtils;
 import org.mozilla.gecko.util.StringUtils;
@@ -1442,17 +1441,17 @@ abstract public class BrowserApp extends
 
     /* Favicon stuff. */
     private static OnFaviconLoadedListener sFaviconLoadedListener = new OnFaviconLoadedListener() {
         @Override
         public void onFaviconLoaded(String pageUrl, String faviconURL, Bitmap favicon) {
             // If we failed to load a favicon, we use the default favicon instead.
             Tabs.getInstance()
                 .updateFaviconForURL(pageUrl,
-                                     (favicon == null) ? Favicons.sDefaultFavicon : favicon);
+                                     (favicon == null) ? Favicons.defaultFavicon : favicon);
         }
     };
 
     private void loadFavicon(final Tab tab) {
         maybeCancelFaviconLoad(tab);
 
         final int tabFaviconSize = getResources().getDimensionPixelSize(R.dimen.browser_toolbar_favicon_size);
 
@@ -1689,26 +1688,32 @@ abstract public class BrowserApp extends
             mLayerView.getLayerMarginsAnimator().showMargins(true);
         }
 
         if (mHomePager == null) {
             final ViewStub homePagerStub = (ViewStub) findViewById(R.id.home_pager_stub);
             mHomePager = (HomePager) homePagerStub.inflate();
 
             final HomeBanner homeBanner = (HomeBanner) findViewById(R.id.home_banner);
-            mHomePager.setBanner(homeBanner);
-
-            // Remove the banner from the view hierarchy if it is dismissed.
-            homeBanner.setOnDismissListener(new HomeBanner.OnDismissListener() {
-                @Override
-                public void onDismiss() {
-                    mHomePager.setBanner(null);
-                    mHomePagerContainer.removeView(homeBanner);
-                }
-            });
+
+            // Never show the home banner in guest mode.
+            if (GeckoProfile.get(this).inGuestMode()) {
+                mHomePagerContainer.removeView(homeBanner);
+            } else {
+                mHomePager.setBanner(homeBanner);
+
+                // Remove the banner from the view hierarchy if it is dismissed.
+                homeBanner.setOnDismissListener(new HomeBanner.OnDismissListener() {
+                    @Override
+                    public void onDismiss() {
+                        mHomePager.setBanner(null);
+                        mHomePagerContainer.removeView(homeBanner);
+                    }
+                });
+            }
         }
 
         mHomePagerContainer.setVisibility(View.VISIBLE);
         mHomePager.load(getSupportLoaderManager(),
                         getSupportFragmentManager(),
                         pageId, animator);
 
         // Hide the web content so it cannot be focused by screen readers.

--- a/mobile/android/base/GeckoAppShell.java
+++ b/mobile/android/base/GeckoAppShell.java
@@ -1116,20 +1116,23 @@ public class GeckoAppShell
             }
         }
         return true;
     }
 
     /**
      * Given the inputs to <code>getOpenURIIntent</code>, plus an optional
      * package name and class name, create and fire an intent to open the
-     * provided URI.
+     * provided URI. If a class name is specified but a package name is not,
+     * we will default to using the current fennec package.
      *
      * @param targetURI the string spec of the URI to open.
      * @param mimeType an optional MIME type string.
+     * @param packageName an optional app package name.
+     * @param className an optional intent class name.
      * @param action an Android action specifier, such as
      *               <code>Intent.ACTION_SEND</code>.
      * @param title the title to use in <code>ACTION_SEND</code> intents.
      * @return true if the activity started successfully; false otherwise.
      */
     @WrapElementForJNI
     public static boolean openUriExternal(String targetURI,
                                           String mimeType,
@@ -1140,18 +1143,23 @@ public class GeckoAppShell
         final Context context = getContext();
         final Intent intent = getOpenURIIntent(context, targetURI,
                                                mimeType, action, title);
 
         if (intent == null) {
             return false;
         }
 
-        if (packageName.length() > 0 && className.length() > 0) {
-            intent.setClassName(packageName, className);
+        if (!TextUtils.isEmpty(className)) {
+            if (!TextUtils.isEmpty(packageName)) {
+                intent.setClassName(packageName, className);
+            } else {
+                // Default to using the fennec app context.
+                intent.setClassName(context, className);
+            }
         }
 
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         try {
             context.startActivity(intent);
             return true;
         } catch (ActivityNotFoundException e) {
             return false;

--- a/mobile/android/base/favicons/Favicons.java
+++ b/mobile/android/base/favicons/Favicons.java
@@ -8,38 +8,34 @@ package org.mozilla.gecko.favicons;
 import org.mozilla.gecko.AboutPages;
 import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.db.BrowserDB;
 import org.mozilla.gecko.favicons.cache.FaviconCache;
-import org.mozilla.gecko.gfx.BitmapUtils;
 import org.mozilla.gecko.util.GeckoJarReader;
 import org.mozilla.gecko.util.NonEvictingLruCache;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 
 import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 
 public class Favicons {
     private static final String LOGTAG = "GeckoFavicons";
 
     // A magic URL representing the app's own favicon, used for about: pages.
     private static final String BUILT_IN_FAVICON_URL = "about:favicon";
 
     // Size of the favicon bitmap cache, in bytes (Counting payload only).
@@ -48,46 +44,46 @@ public class Favicons {
     // Number of URL mappings from page URL to Favicon URL to cache in memory.
     public static final int NUM_PAGE_URL_MAPPINGS_TO_STORE = 128;
 
     public static final int NOT_LOADING  = 0;
     public static final int LOADED       = 1;
     public static final int FLAG_PERSIST = 2;
     public static final int FLAG_SCALE   = 4;
 
-    protected static Context sContext;
+    protected static Context context;
 
     // The default Favicon to show if no other can be found.
-    public static Bitmap sDefaultFavicon;
+    public static Bitmap defaultFavicon;
 
     // The density-adjusted default Favicon dimensions.
-    public static int sDefaultFaviconSize;
+    public static int defaultFaviconSize;
 
     // The density-adjusted maximum Favicon dimensions.
-    public static int sLargestFaviconSize;
+    public static int largestFaviconSize;
 
-    private static final SparseArray<LoadFaviconTask> sLoadTasks = new SparseArray<LoadFaviconTask>();
+    private static final SparseArray<LoadFaviconTask> loadTasks = new SparseArray<LoadFaviconTask>();
 
     // Cache to hold mappings between page URLs and Favicon URLs. Used to avoid going to the DB when
     // doing so is not necessary.
-    private static final NonEvictingLruCache<String, String> sPageURLMappings = new NonEvictingLruCache<String, String>(NUM_PAGE_URL_MAPPINGS_TO_STORE);
+    private static final NonEvictingLruCache<String, String> pageURLMappings = new NonEvictingLruCache<String, String>(NUM_PAGE_URL_MAPPINGS_TO_STORE);
 
     public static String getFaviconURLForPageURLFromCache(String pageURL) {
-        return sPageURLMappings.get(pageURL);
+        return pageURLMappings.get(pageURL);
     }
 
     /**
      * Insert the given pageUrl->faviconUrl mapping into the memory cache of such mappings.
      * Useful for short-circuiting local database access.
      */
     public static void putFaviconURLForPageURLInCache(String pageURL, String faviconURL) {
-        sPageURLMappings.put(pageURL, faviconURL);
+        pageURLMappings.put(pageURL, faviconURL);
     }
 
-    private static FaviconCache sFaviconsCache;
+    private static FaviconCache faviconsCache;
 
     /**
      * Returns either NOT_LOADING, or LOADED if the onFaviconLoaded call could
      * be made on the main thread.
      * If no listener is provided, NOT_LOADING is returned.
      */
     static int dispatchResult(final String pageUrl, final String faviconURL, final Bitmap image,
             final OnFaviconLoadedListener listener) {
@@ -112,17 +108,17 @@ public class Favicons {
 
     /**
      * Only returns a non-null Bitmap if the entire path is cached -- the
      * page URL to favicon URL, and the favicon URL to in-memory bitmaps.
      *
      * Returns null otherwise.
      */
     public static Bitmap getSizedFaviconForPageFromCache(final String pageURL, int targetSize) {
-        final String faviconURL = sPageURLMappings.get(pageURL);
+        final String faviconURL = pageURLMappings.get(pageURL);
         if (faviconURL == null) {
             return null;
         }
         return getSizedFaviconFromCache(faviconURL, targetSize);
     }
 
     /**
      * Get a Favicon as close as possible to the target dimensions for the URL provided.
@@ -138,37 +134,37 @@ public class Favicons {
      *                  immediately available.
      * @return The id of the asynchronous task created, NOT_LOADING if none is created, or
      *         LOADED if the value could be dispatched on the current thread.
      */
     public static int getSizedFavicon(String pageURL, String faviconURL, int targetSize, int flags, OnFaviconLoadedListener listener) {
         // Do we know the favicon URL for this page already?
         String cacheURL = faviconURL;
         if (cacheURL == null) {
-            cacheURL = sPageURLMappings.get(pageURL);
+            cacheURL = pageURLMappings.get(pageURL);
         }
 
         // If there's no favicon URL given, try and hit the cache with the default one.
         if (cacheURL == null)  {
             cacheURL = guessDefaultFaviconURL(pageURL);
         }
 
         // If it's something we can't even figure out a default URL for, just give up.
         if (cacheURL == null) {
-            return dispatchResult(pageURL, null, sDefaultFavicon, listener);
+            return dispatchResult(pageURL, null, defaultFavicon, listener);
         }
 
         Bitmap cachedIcon = getSizedFaviconFromCache(cacheURL, targetSize);
         if (cachedIcon != null) {
             return dispatchResult(pageURL, cacheURL, cachedIcon, listener);
         }
 
         // Check if favicon has failed.
-        if (sFaviconsCache.isFailedFavicon(cacheURL)) {
-            return dispatchResult(pageURL, cacheURL, sDefaultFavicon, listener);
+        if (faviconsCache.isFailedFavicon(cacheURL)) {
+            return dispatchResult(pageURL, cacheURL, defaultFavicon, listener);
         }
 
         // Failing that, try and get one from the database or internet.
         return loadUncachedFavicon(pageURL, faviconURL, flags, targetSize, listener);
     }
 
     /**
      * Returns the cached Favicon closest to the target size if any exists or is coercible. Returns
@@ -176,17 +172,17 @@ public class Favicons {
      * immediately available.
      *
      * @param faviconURL URL of the Favicon to query for.
      * @param targetSize The desired size of the returned Favicon.
      * @return The cached Favicon, rescaled to be as close as possible to the target size, if any exists.
      *         null if no applicable Favicon exists in the cache.
      */
     public static Bitmap getSizedFaviconFromCache(String faviconURL, int targetSize) {
-        return sFaviconsCache.getFaviconForDimensions(faviconURL, targetSize);
+        return faviconsCache.getFaviconForDimensions(faviconURL, targetSize);
     }
 
     /**
      * Attempts to find a Favicon for the provided page URL from either the mem cache or the database.
      * Does not need an explicit favicon URL, since, as we are accessing the database anyway, we
      * can query the history DB for the Favicon URL.
      * Handy for easing the transition from caching with page URLs to caching with Favicon URLs.
      *
@@ -196,43 +192,43 @@ public class Favicons {
      * @param pageURL Page URL for which a Favicon is wanted.
      * @param targetSize Target size of the desired Favicon to pass to the cache query
      * @param callback Callback to fire with the result.
      * @return The job ID of the spawned async task, if any.
      */
     public static int getSizedFaviconForPageFromLocal(final String pageURL, final int targetSize, final OnFaviconLoadedListener callback) {
         // Firstly, try extremely hard to cheat.
         // Have we cached this favicon URL? If we did, we can consult the memcache right away.
-        String targetURL = sPageURLMappings.get(pageURL);
+        String targetURL = pageURLMappings.get(pageURL);
         if (targetURL != null) {
             // Check if favicon has failed.
-            if (sFaviconsCache.isFailedFavicon(targetURL)) {
+            if (faviconsCache.isFailedFavicon(targetURL)) {
                 return dispatchResult(pageURL, targetURL, null, callback);
             }
 
             // Do we have a Favicon in the cache for this favicon URL?
             Bitmap result = getSizedFaviconFromCache(targetURL, targetSize);
             if (result != null) {
                 // Victory - immediate response!
                 return dispatchResult(pageURL, targetURL, result, callback);
             }
         }
 
         // No joy using in-memory resources. Go to background thread and ask the database.
         LoadFaviconTask task = new LoadFaviconTask(ThreadUtils.getBackgroundHandler(), pageURL, targetURL, 0, callback, targetSize, true);
         int taskId = task.getId();
-        synchronized(sLoadTasks) {
-            sLoadTasks.put(taskId, task);
+        synchronized(loadTasks) {
+            loadTasks.put(taskId, task);
         }
         task.execute();
         return taskId;
     }
 
     public static int getSizedFaviconForPageFromLocal(final String pageURL, final OnFaviconLoadedListener callback) {
-        return getSizedFaviconForPageFromLocal(pageURL, sDefaultFaviconSize, callback);
+        return getSizedFaviconForPageFromLocal(pageURL, defaultFaviconSize, callback);
     }
 
     /**
      * Helper method to determine the URL of the Favicon image for a given page URL by querying the
      * history database. Should only be called from the background thread - does database access.
      *
      * @param pageURL The URL of a webpage with a Favicon.
      * @return The URL of the Favicon used by that webpage, according to either the History database
@@ -245,17 +241,17 @@ public class Favicons {
         Tab theTab = Tabs.getInstance().getFirstTabForUrl(pageURL);
         if (theTab != null) {
             targetURL = theTab.getFaviconURL();
             if (targetURL != null) {
                 return targetURL;
             }
         }
 
-        targetURL = BrowserDB.getFaviconUrlForHistoryUrl(sContext.getContentResolver(), pageURL);
+        targetURL = BrowserDB.getFaviconUrlForHistoryUrl(context.getContentResolver(), pageURL);
         if (targetURL == null) {
             // Nothing in the history database. Fall back to the default URL and hope for the best.
             targetURL = guessDefaultFaviconURL(pageURL);
         }
         return targetURL;
     }
 
     /**
@@ -281,124 +277,125 @@ public class Favicons {
         if (TextUtils.isEmpty(pageUrl)) {
             dispatchResult(null, null, null, listener);
             return NOT_LOADING;
         }
 
         LoadFaviconTask task = new LoadFaviconTask(ThreadUtils.getBackgroundHandler(), pageUrl, faviconUrl, flags, listener, targetSize, false);
 
         int taskId = task.getId();
-        synchronized(sLoadTasks) {
-            sLoadTasks.put(taskId, task);
+        synchronized(loadTasks) {
+            loadTasks.put(taskId, task);
         }
 
         task.execute();
 
         return taskId;
     }
 
     public static void putFaviconInMemCache(String pageUrl, Bitmap image) {
-        sFaviconsCache.putSingleFavicon(pageUrl, image);
+        faviconsCache.putSingleFavicon(pageUrl, image);
     }
 
     /**
      * Adds the bitmaps given by the specified iterator to the cache associated with the url given.
      * Future requests for images will be able to select the least larger image than the target
      * size from this new set of images.
      *
      * @param pageUrl The URL to associate the new favicons with.
      * @param images An iterator over the new favicons to put in the cache.
      */
     public static void putFaviconsInMemCache(String pageUrl, Iterator<Bitmap> images, boolean permanently) {
-        sFaviconsCache.putFavicons(pageUrl, images, permanently);
+        faviconsCache.putFavicons(pageUrl, images, permanently);
     }
 
     public static void putFaviconsInMemCache(String pageUrl, Iterator<Bitmap> images) {
         putFaviconsInMemCache(pageUrl, images, false);
     }
 
     public static void clearMemCache() {
-        sFaviconsCache.evictAll();
-        sPageURLMappings.evictAll();
+        faviconsCache.evictAll();
+        pageURLMappings.evictAll();
     }
 
     public static void putFaviconInFailedCache(String faviconURL) {
-        sFaviconsCache.putFailed(faviconURL);
+        faviconsCache.putFailed(faviconURL);
     }
 
     public static boolean cancelFaviconLoad(int taskId) {
         if (taskId == NOT_LOADING) {
             return false;
         }
 
         boolean cancelled;
-        synchronized (sLoadTasks) {
-            if (sLoadTasks.indexOfKey(taskId) < 0)
+        synchronized (loadTasks) {
+            if (loadTasks.indexOfKey(taskId) < 0) {
                 return false;
+            }
 
             Log.d(LOGTAG, "Cancelling favicon load (" + taskId + ")");
 
-            LoadFaviconTask task = sLoadTasks.get(taskId);
+            LoadFaviconTask task = loadTasks.get(taskId);
             cancelled = task.cancel(false);
         }
         return cancelled;
     }
 
     public static void close() {
         Log.d(LOGTAG, "Closing Favicons database");
 
         // Cancel any pending tasks
-        synchronized (sLoadTasks) {
-            final int count = sLoadTasks.size();
+        synchronized (loadTasks) {
+            final int count = loadTasks.size();
             for (int i = 0; i < count; i++) {
-                cancelFaviconLoad(sLoadTasks.keyAt(i));
+                cancelFaviconLoad(loadTasks.keyAt(i));
             }
-            sLoadTasks.clear();
+            loadTasks.clear();
         }
 
         LoadFaviconTask.closeHTTPClient();
     }
 
     /**
      * Get the dominant colour of the Favicon at the URL given, if any exists in the cache.
      *
      * @param url The URL of the Favicon, to be used as the cache key for the colour value.
      * @return The dominant colour of the provided Favicon.
      */
     public static int getFaviconColor(String url) {
-        return sFaviconsCache.getDominantColor(url);
+        return faviconsCache.getDominantColor(url);
     }
 
     /**
      * Called by GeckoApp on startup to pass this class a reference to the GeckoApp object used as
      * the application's Context.
      * Consider replacing with references to a staticly held reference to the GeckoApp object.
      *
      * @param context A reference to the GeckoApp instance.
      */
     public static void attachToContext(Context context) throws Exception {
         final Resources res = context.getResources();
-        sContext = context;
+        Favicons.context = context;
 
         // Decode the default Favicon ready for use.
-        sDefaultFavicon = BitmapFactory.decodeResource(res, R.drawable.favicon);
-        if (sDefaultFavicon == null) {
+        defaultFavicon = BitmapFactory.decodeResource(res, R.drawable.favicon);
+        if (defaultFavicon == null) {
             throw new Exception("Null default favicon was returned from the resources system!");
         }
 
-        sDefaultFaviconSize = res.getDimensionPixelSize(R.dimen.favicon_bg);
+        defaultFaviconSize = res.getDimensionPixelSize(R.dimen.favicon_bg);
 
         // Screen-density-adjusted upper limit on favicon size. Favicons larger than this are
         // downscaled to this size or discarded.
-        sLargestFaviconSize = context.getResources().getDimensionPixelSize(R.dimen.favicon_largest_interesting_size);
-        sFaviconsCache = new FaviconCache(FAVICON_CACHE_SIZE_BYTES, sLargestFaviconSize);
+        largestFaviconSize = context.getResources().getDimensionPixelSize(R.dimen.favicon_largest_interesting_size);
+        faviconsCache = new FaviconCache(FAVICON_CACHE_SIZE_BYTES, largestFaviconSize);
 
         // Initialize page mappings for each of our special pages.
         for (String url : AboutPages.getDefaultIconPages()) {
-            sPageURLMappings.putWithoutEviction(url, BUILT_IN_FAVICON_URL);
+            pageURLMappings.putWithoutEviction(url, BUILT_IN_FAVICON_URL);
         }
 
         // Load and cache the built-in favicon in each of its sizes.
         // TODO: don't open the zip twice!
         List<Bitmap> toInsert = Arrays.asList(loadBrandingBitmap(context, "favicon64.png"),
                                               loadBrandingBitmap(context, "favicon32.png"));
 
         putFaviconsInMemCache(BUILT_IN_FAVICON_URL, toInsert.iterator(), true);
@@ -448,28 +445,28 @@ public class Favicons {
                            null).toString();
         } catch (URISyntaxException e) {
             Log.e(LOGTAG, "URISyntaxException getting default favicon URL", e);
             return null;
         }
     }
 
     public static void removeLoadTask(int taskId) {
-        synchronized(sLoadTasks) {
-            sLoadTasks.delete(taskId);
+        synchronized(loadTasks) {
+            loadTasks.delete(taskId);
         }
     }
 
     /**
      * Method to wrap FaviconCache.isFailedFavicon for use by LoadFaviconTask.
      *
      * @param faviconURL Favicon URL to check for failure.
      */
     static boolean isFailedFavicon(String faviconURL) {
-        return sFaviconsCache.isFailedFavicon(faviconURL);
+        return faviconsCache.isFailedFavicon(faviconURL);
     }
 
     /**
      * Sidestep the cache and get, from either the database or the internet, a favicon
      * suitable for use as an app icon for the provided URL.
      *
      * Useful for creating homescreen shortcuts without being limited
      * by possibly low-resolution values in the cache.

--- a/mobile/android/base/favicons/LoadFaviconTask.java
+++ b/mobile/android/base/favicons/LoadFaviconTask.java
@@ -17,17 +17,17 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.db.BrowserDB;
 import org.mozilla.gecko.favicons.decoders.FaviconDecoder;
 import org.mozilla.gecko.favicons.decoders.LoadFaviconResult;
 import org.mozilla.gecko.util.GeckoJarReader;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.util.UiAsyncTask;
-import static org.mozilla.gecko.favicons.Favicons.sContext;
+import static org.mozilla.gecko.favicons.Favicons.context;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -48,66 +48,66 @@ public class LoadFaviconTask extends UiA
 
     public static final int FLAG_PERSIST = 1;
     public static final int FLAG_SCALE = 2;
     private static final int MAX_REDIRECTS_TO_FOLLOW = 5;
     // The default size of the buffer to use for downloading Favicons in the event no size is given
     // by the server.
     private static final int DEFAULT_FAVICON_BUFFER_SIZE = 25000;
 
-    private static AtomicInteger mNextFaviconLoadId = new AtomicInteger(0);
-    private int mId;
-    private String mPageUrl;
-    private String mFaviconUrl;
-    private OnFaviconLoadedListener mListener;
-    private int mFlags;
+    private static AtomicInteger nextFaviconLoadId = new AtomicInteger(0);
+    private int id;
+    private String pageUrl;
+    private String faviconURL;
+    private OnFaviconLoadedListener listener;
+    private int flags;
 
-    private final boolean mOnlyFromLocal;
+    private final boolean onlyFromLocal;
 
     // Assuming square favicons, judging by width only is acceptable.
-    protected int mTargetWidth;
-    private LinkedList<LoadFaviconTask> mChainees;
-    private boolean mIsChaining;
+    protected int targetWidth;
+    private LinkedList<LoadFaviconTask> chainees;
+    private boolean isChaining;
 
-    static AndroidHttpClient sHttpClient = AndroidHttpClient.newInstance(GeckoAppShell.getGeckoInterface().getDefaultUAString());
+    static AndroidHttpClient httpClient = AndroidHttpClient.newInstance(GeckoAppShell.getGeckoInterface().getDefaultUAString());
 
     public LoadFaviconTask(Handler backgroundThreadHandler,
                            String pageUrl, String faviconUrl, int flags,
                            OnFaviconLoadedListener listener) {
         this(backgroundThreadHandler, pageUrl, faviconUrl, flags, listener, -1, false);
     }
     public LoadFaviconTask(Handler backgroundThreadHandler,
                            String pageUrl, String faviconUrl, int flags,
-                           OnFaviconLoadedListener aListener, int targetSize, boolean fromLocal) {
+                           OnFaviconLoadedListener listener, int targetWidth, boolean onlyFromLocal) {
         super(backgroundThreadHandler);
 
-        mId = mNextFaviconLoadId.incrementAndGet();
+        id = nextFaviconLoadId.incrementAndGet();
 
-        mPageUrl = pageUrl;
-        mFaviconUrl = faviconUrl;
-        mListener = aListener;
-        mFlags = flags;
-        mTargetWidth = targetSize;
-        mOnlyFromLocal = fromLocal;
+        this.pageUrl = pageUrl;
+        this.faviconURL = faviconUrl;
+        this.listener = listener;
+        this.flags = flags;
+        this.targetWidth = targetWidth;
+        this.onlyFromLocal = onlyFromLocal;
     }
 
     // Runs in background thread
     private LoadFaviconResult loadFaviconFromDb() {
-        ContentResolver resolver = sContext.getContentResolver();
-        return BrowserDB.getFaviconForFaviconUrl(resolver, mFaviconUrl);
+        ContentResolver resolver = context.getContentResolver();
+        return BrowserDB.getFaviconForFaviconUrl(resolver, faviconURL);
     }
 
     // Runs in background thread
     private void saveFaviconToDb(final byte[] encodedFavicon) {
-        if ((mFlags & FLAG_PERSIST) == 0) {
+        if ((flags & FLAG_PERSIST) == 0) {
             return;
         }
 
-        ContentResolver resolver = sContext.getContentResolver();
-        BrowserDB.updateFaviconForUrl(resolver, mPageUrl, encodedFavicon, mFaviconUrl);
+        ContentResolver resolver = context.getContentResolver();
+        BrowserDB.updateFaviconForUrl(resolver, pageUrl, encodedFavicon, faviconURL);
     }
 
     /**
      * Helper method for trying the download request to grab a Favicon.
      * @param faviconURI URL of Favicon to try and download
      * @return The HttpResponse containing the downloaded Favicon if successful, null otherwise.
      */
     private HttpResponse tryDownload(URI faviconURI) throws URISyntaxException, IOException {
@@ -116,17 +116,17 @@ public class LoadFaviconTask extends UiA
         return tryDownloadRecurse(faviconURI, visitedLinkSet);
     }
     private HttpResponse tryDownloadRecurse(URI faviconURI, HashSet<String> visited) throws URISyntaxException, IOException {
         if (visited.size() == MAX_REDIRECTS_TO_FOLLOW) {
             return null;
         }
 
         HttpGet request = new HttpGet(faviconURI);
-        HttpResponse response = sHttpClient.execute(request);
+        HttpResponse response = httpClient.execute(request);
         if (response == null) {
             return null;
         }
 
         if (response.getStatusLine() != null) {
 
             // Was the response a failure?
             int status = response.getStatusLine().getStatusCode();
@@ -167,17 +167,17 @@ public class LoadFaviconTask extends UiA
      */
     private static Bitmap fetchJARFavicon(String uri) {
         if (uri == null) {
             return null;
         }
         if (uri.startsWith("jar:jar:")) {
             Log.d(LOGTAG, "Fetching favicon from JAR.");
             try {
-                return GeckoJarReader.getBitmap(sContext.getResources(), uri);
+                return GeckoJarReader.getBitmap(context.getResources(), uri);
             } catch (Exception e) {
                 // Just about anything could happen here.
                 Log.w(LOGTAG, "Error fetching favicon from JAR.", e);
                 return null;
             }
         }
         return null;
     }
@@ -282,129 +282,129 @@ public class LoadFaviconTask extends UiA
             return null;
         }
 
         String storedFaviconUrl;
         boolean isUsingDefaultURL = false;
 
         // Handle the case of malformed favicon URL.
         // If favicon is empty, fall back to the stored one.
-        if (TextUtils.isEmpty(mFaviconUrl)) {
+        if (TextUtils.isEmpty(faviconURL)) {
             // Try to get the favicon URL from the memory cache.
-            storedFaviconUrl = Favicons.getFaviconURLForPageURLFromCache(mPageUrl);
+            storedFaviconUrl = Favicons.getFaviconURLForPageURLFromCache(pageUrl);
 
             // If that failed, try to get the URL from the database.
             if (storedFaviconUrl == null) {
-                storedFaviconUrl = Favicons.getFaviconURLForPageURL(mPageUrl);
+                storedFaviconUrl = Favicons.getFaviconURLForPageURL(pageUrl);
                 if (storedFaviconUrl != null) {
                     // If that succeeded, cache the URL loaded from the database in memory.
-                    Favicons.putFaviconURLForPageURLInCache(mPageUrl, storedFaviconUrl);
+                    Favicons.putFaviconURLForPageURLInCache(pageUrl, storedFaviconUrl);
                 }
             }
 
             // If we found a faviconURL - use it.
             if (storedFaviconUrl != null) {
-                mFaviconUrl = storedFaviconUrl;
+                faviconURL = storedFaviconUrl;
             } else {
                 // If we don't have a stored one, fall back to the default.
-                mFaviconUrl = Favicons.guessDefaultFaviconURL(mPageUrl);
+                faviconURL = Favicons.guessDefaultFaviconURL(pageUrl);
 
-                if (TextUtils.isEmpty(mFaviconUrl)) {
+                if (TextUtils.isEmpty(faviconURL)) {
                     return null;
                 }
                 isUsingDefaultURL = true;
             }
         }
 
         // Check if favicon has failed - if so, give up. We need this check because, sometimes, we
         // didn't know the real Favicon URL until we asked the database.
-        if (Favicons.isFailedFavicon(mFaviconUrl)) {
+        if (Favicons.isFailedFavicon(faviconURL)) {
             return null;
         }
 
         if (isCancelled()) {
             return null;
         }
 
         Bitmap image;
         // Determine if there is already an ongoing task to fetch the Favicon we desire.
         // If there is, just join the queue and wait for it to finish. If not, we carry on.
         synchronized(loadsInFlight) {
             // Another load of the current Favicon is already underway
-            LoadFaviconTask existingTask = loadsInFlight.get(mFaviconUrl);
+            LoadFaviconTask existingTask = loadsInFlight.get(faviconURL);
             if (existingTask != null && !existingTask.isCancelled()) {
                 existingTask.chainTasks(this);
-                mIsChaining = true;
+                isChaining = true;
 
                 // If we are chaining, we want to keep the first task started to do this job as the one
                 // in the hashmap so subsequent tasks will add themselves to its chaining list.
                 return null;
             }
 
             // We do not want to update the hashmap if the task has chained - other tasks need to
             // chain onto the same parent task.
-            loadsInFlight.put(mFaviconUrl, this);
+            loadsInFlight.put(faviconURL, this);
         }
 
         if (isCancelled()) {
             return null;
         }
 
         // If there are no valid bitmaps decoded, the returned LoadFaviconResult is null.
         LoadFaviconResult loadedBitmaps = loadFaviconFromDb();
         if (loadedBitmaps != null) {
             return pushToCacheAndGetResult(loadedBitmaps);
         }
 
-        if (mOnlyFromLocal || isCancelled()) {
+        if (onlyFromLocal || isCancelled()) {
             return null;
         }
 
         // Let's see if it's in a JAR.
-        image = fetchJARFavicon(mFaviconUrl);
+        image = fetchJARFavicon(faviconURL);
         if (imageIsValid(image)) {
             // We don't want to put this into the DB.
-            Favicons.putFaviconInMemCache(mFaviconUrl, image);
+            Favicons.putFaviconInMemCache(faviconURL, image);
             return image;
         }
 
         try {
-            loadedBitmaps = downloadFavicon(new URI(mFaviconUrl));
+            loadedBitmaps = downloadFavicon(new URI(faviconURL));
         } catch (URISyntaxException e) {
             Log.e(LOGTAG, "The provided favicon URL is not valid");
             return null;
         } catch (Exception e) {
             Log.e(LOGTAG, "Couldn't download favicon.", e);
         }
 
         if (loadedBitmaps != null) {
             saveFaviconToDb(loadedBitmaps.getBytesForDatabaseStorage());
             return pushToCacheAndGetResult(loadedBitmaps);
         }
 
         if (isUsingDefaultURL) {
-            Favicons.putFaviconInFailedCache(mFaviconUrl);
+            Favicons.putFaviconInFailedCache(faviconURL);
             return null;
         }
 
         if (isCancelled()) {
             return null;
         }
 
         // If we're not already trying the default URL, try it now.
-        final String guessed = Favicons.guessDefaultFaviconURL(mPageUrl);
+        final String guessed = Favicons.guessDefaultFaviconURL(pageUrl);
         if (guessed == null) {
-            Favicons.putFaviconInFailedCache(mFaviconUrl);
+            Favicons.putFaviconInFailedCache(faviconURL);
             return null;
         }
 
         image = fetchJARFavicon(guessed);
         if (imageIsValid(image)) {
             // We don't want to put this into the DB.
-            Favicons.putFaviconInMemCache(mFaviconUrl, image);
+            Favicons.putFaviconInMemCache(faviconURL, image);
             return image;
         }
 
         try {
             loadedBitmaps = downloadFavicon(new URI(guessed));
         } catch (Exception e) {
             // Not interesting. It was an educated guess, anyway.
             return null;
@@ -423,124 +423,124 @@ public class LoadFaviconTask extends UiA
      * cache for the particular bitmap we want for this request.
      * This call is certain to succeed, provided there was enough memory to decode this favicon.
      *
      * @param loadedBitmaps LoadFaviconResult to store.
      * @return The optimal favicon available to satisfy this LoadFaviconTask's request, or null if
      *         we are under extreme memory pressure and find ourselves dropping the cache immediately.
      */
     private Bitmap pushToCacheAndGetResult(LoadFaviconResult loadedBitmaps) {
-        Favicons.putFaviconsInMemCache(mFaviconUrl, loadedBitmaps.getBitmaps());
-        Bitmap result = Favicons.getSizedFaviconFromCache(mFaviconUrl, mTargetWidth);
+        Favicons.putFaviconsInMemCache(faviconURL, loadedBitmaps.getBitmaps());
+        Bitmap result = Favicons.getSizedFaviconFromCache(faviconURL, targetWidth);
         return result;
     }
 
     private static boolean imageIsValid(final Bitmap image) {
         return image != null &&
                image.getWidth() > 0 &&
                image.getHeight() > 0;
     }
 
     @Override
     protected void onPostExecute(Bitmap image) {
-        if (mIsChaining) {
+        if (isChaining) {
             return;
         }
 
         // Process the result, scale for the listener, etc.
         processResult(image);
 
         synchronized (loadsInFlight) {
             // Prevent any other tasks from chaining on this one.
-            loadsInFlight.remove(mFaviconUrl);
+            loadsInFlight.remove(faviconURL);
         }
 
-        // Since any update to mChainees is done while holding the loadsInFlight lock, once we reach
+        // Since any update to chainees is done while holding the loadsInFlight lock, once we reach
         // this point no further updates to that list can possibly take place (As far as other tasks
         // are concerned, there is no longer a task to chain from. The above block will have waited
         // for any tasks that were adding themselves to the list before reaching this point.)
 
         // As such, I believe we're safe to do the following without holding the lock.
         // This is nice - we do not want to take the lock unless we have to anyway, and chaining rarely
         // actually happens outside of the strange situations unit tests create.
 
         // Share the result with all chained tasks.
-        if (mChainees != null) {
-            for (LoadFaviconTask t : mChainees) {
+        if (chainees != null) {
+            for (LoadFaviconTask t : chainees) {
                 // In the case that we just decoded multiple favicons, either we're passing the right
                 // image now, or the call into the cache in processResult will fetch the right one.
                 t.processResult(image);
             }
         }
     }
 
     private void processResult(Bitmap image) {
-        Favicons.removeLoadTask(mId);
+        Favicons.removeLoadTask(id);
         Bitmap scaled = image;
 
         // Notify listeners, scaling if required.
-        if (mTargetWidth != -1 && image != null &&  image.getWidth() != mTargetWidth) {
-            scaled = Favicons.getSizedFaviconFromCache(mFaviconUrl, mTargetWidth);
+        if (targetWidth != -1 && image != null &&  image.getWidth() != targetWidth) {
+            scaled = Favicons.getSizedFaviconFromCache(faviconURL, targetWidth);
         }
 
-        Favicons.dispatchResult(mPageUrl, mFaviconUrl, scaled, mListener);
+        Favicons.dispatchResult(pageUrl, faviconURL, scaled, listener);
     }
 
     @Override
     protected void onCancelled() {
-        Favicons.removeLoadTask(mId);
+        Favicons.removeLoadTask(id);
 
         synchronized(loadsInFlight) {
             // Only remove from the hashmap if the task there is the one that's being canceled.
             // Cancellation of a task that would have chained is not interesting to the hashmap.
-            final LoadFaviconTask primary = loadsInFlight.get(mFaviconUrl);
+            final LoadFaviconTask primary = loadsInFlight.get(faviconURL);
             if (primary == this) {
-                loadsInFlight.remove(mFaviconUrl);
+                loadsInFlight.remove(faviconURL);
                 return;
             }
             if (primary == null) {
                 // This shouldn't happen.
                 return;
             }
-            if (primary.mChainees != null) {
-              primary.mChainees.remove(this);
+            if (primary.chainees != null) {
+              primary.chainees.remove(this);
             }
         }
 
         // Note that we don't call the listener callback if the
         // favicon load is cancelled.
     }
 
     /**
      * When the result of this job is ready, also notify the chainee of the result.
      * Used for aggregating concurrent requests for the same Favicon into a single actual request.
      * (Don't want to download a hundred instances of Google's Favicon at once, for example).
      * The loadsInFlight lock must be held when calling this function.
      *
      * @param aChainee LoadFaviconTask
      */
     private void chainTasks(LoadFaviconTask aChainee) {
-        if (mChainees == null) {
-            mChainees = new LinkedList<LoadFaviconTask>();
+        if (chainees == null) {
+            chainees = new LinkedList<LoadFaviconTask>();
         }
 
-        mChainees.add(aChainee);
+        chainees.add(aChainee);
     }
 
     int getId() {
-        return mId;
+        return id;
     }
 
     static void closeHTTPClient() {
         // This work must be done on a background thread because it shuts down
         // the connection pool, which typically involves closing a connection --
         // which counts as network activity.
         if (ThreadUtils.isOnBackgroundThread()) {
-            if (sHttpClient != null) {
-                sHttpClient.close();
+            if (httpClient != null) {
+                httpClient.close();
             }
             return;
         }
 
         ThreadUtils.postToBackgroundThread(new Runnable() {
             @Override
             public void run() {
                 LoadFaviconTask.closeHTTPClient();

--- a/mobile/android/base/favicons/cache/FaviconCache.java
+++ b/mobile/android/base/favicons/cache/FaviconCache.java
@@ -15,17 +15,17 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Implements a Least-Recently-Used cache for Favicons, keyed by Favicon URL.
  *
  * When a favicon at a particular URL is decoded, it will yield one or more bitmaps.
  * While in memory, these bitmaps are stored in a list, sorted in ascending order of size, in a
  * FaviconsForURL object.
- * The collection of FaviconsForURL objects currently in the cache is stored in mBackingMap, keyed
+ * The collection of FaviconsForURL objects currently in the cache is stored in backingMap, keyed
  * by favicon URL.
  *
  * A second map exists for permanent cache entries -- ones that are never expired. These entries
  * are assumed to be disjoint from those in the normal cache, and this map is checked first.
  *
  * FaviconsForURL provides a method for obtaining the smallest icon larger than a given size - the
  * most appropriate icon for a particular size.
  * It also distinguishes between "primary" favicons (Ones that have merely been extracted from a
@@ -54,17 +54,17 @@ import java.util.concurrent.atomic.Atomi
  * If that step fails, the object finally walks backwards through its sequence of favicons until it
  * finds the largest primary favicon smaller than the target. This is then upscaled by a maximum of
  * 2x towards the target size, and the result cached and returned as above.
  *
  * The bitmaps themselves are encapsulated inside FaviconCacheElement objects. These objects contain,
  * as well as the bitmap, a pointer to the encapsulating FaviconsForURL object (Used by the LRU
  * culler), the size of the encapsulated image, a flag indicating if this is a primary favicon, and
  * a flag indicating if the entry is invalid.
- * All FaviconCacheElement objects are tracked in the mOrdering LinkedList. This is used to record
+ * All FaviconCacheElement objects are tracked in the ordering LinkedList. This is used to record
  * LRU information about FaviconCacheElements. In particular, the most recently used FaviconCacheElement
  * will be at the start of the list, the least recently used at the end of the list.
  *
  * When the cache runs out of space, it removes FaviconCacheElements starting from the end of the list
  * until a sufficient amount of space has been freed.
  * When a secondary favicon is removed in this way, it is simply deleted from its parent FaviconsForURLs
  * object's list of available favicons.
  * The backpointer field on the FaviconCacheElement is used to remove the element from the encapsulating
@@ -93,208 +93,179 @@ import java.util.concurrent.atomic.Atomi
  */
 public class FaviconCache {
     private static final String LOGTAG = "FaviconCache";
 
     // The number of spaces to allocate for favicons in each node.
     private static final int NUM_FAVICON_SIZES = 4;
 
     // Dimensions of the largest favicon to store in the cache. Everything is downscaled to this.
-    public final int mMaxCachedWidth;
+    public final int maxCachedWidth;
 
     // Retry failed favicons after 20 minutes.
     public static final long FAILURE_RETRY_MILLISECONDS = 1000 * 60 * 20;
 
     // Map relating Favicon URLs with objects representing decoded favicons.
     // Since favicons may be container formats holding multiple icons, the underlying type holds a
     // sorted list of bitmap payloads in ascending order of size. The underlying type may be queried
     // for the least larger payload currently present.
-    private final ConcurrentHashMap<String, FaviconsForURL> mBackingMap = new ConcurrentHashMap<String, FaviconsForURL>();
+    private final ConcurrentHashMap<String, FaviconsForURL> backingMap = new ConcurrentHashMap<String, FaviconsForURL>();
 
     // And the same, but never evicted.
-    private final ConcurrentHashMap<String, FaviconsForURL> mPermanentBackingMap = new ConcurrentHashMap<String, FaviconsForURL>();
+    private final ConcurrentHashMap<String, FaviconsForURL> permanentBackingMap = new ConcurrentHashMap<String, FaviconsForURL>();
 
     // A linked list used to implement a queue, defining the LRU properties of the cache. Elements
     // contained within the various FaviconsForURL objects are held here, the least recently used
     // of which at the end of the list. When space needs to be reclaimed, the appropriate bitmap is
     // culled.
-    private final LinkedList<FaviconCacheElement> mOrdering = new LinkedList<FaviconCacheElement>();
+    private final LinkedList<FaviconCacheElement> ordering = new LinkedList<FaviconCacheElement>();
 
     // The above structures, if used correctly, enable this cache to exhibit LRU semantics across all
     // favicon payloads in the system, as well as enabling the dynamic selection from the cache of
     // the primary bitmap most suited to the requested size (in cases where multiple primary bitmaps
     // are provided by the underlying file format).
 
     // Current size, in bytes, of the bitmap data present in the LRU cache.
-    private final AtomicInteger mCurrentSize = new AtomicInteger(0);
+    private final AtomicInteger currentSize = new AtomicInteger(0);
 
     // The maximum quantity, in bytes, of bitmap data which may be stored in the cache.
-    private final int mMaxSizeBytes;
+    private final int maxSizeBytes;
 
     // Tracks the number of ongoing read operations. Enables the first one in to lock writers out and
     // the last one out to let them in.
-    private final AtomicInteger mOngoingReads = new AtomicInteger(0);
+    private final AtomicInteger ongoingReads = new AtomicInteger(0);
 
     // Used to ensure transaction fairness - each txn acquires and releases this as the first operation.
     // The effect is an orderly, inexpensive ordering enforced on txns to prevent writer starvation.
-    private final Semaphore mTurnSemaphore = new Semaphore(1);
+    private final Semaphore turnSemaphore = new Semaphore(1);
 
     // A deviation from the usual MRSW solution - this semaphore is used to guard modification to the
     // ordering map. This allows for read transactions to update the most-recently-used value without
     // needing to take out the write lock.
-    private final Semaphore mReorderingSemaphore = new Semaphore(1);
+    private final Semaphore reorderingSemaphore = new Semaphore(1);
 
     // The semaphore one must acquire in order to perform a write.
-    private final Semaphore mWriteLock = new Semaphore(1);
+    private final Semaphore writeLock = new Semaphore(1);
 
     /**
      * Called by txns performing only reads as they start. Prevents writer starvation with a turn
      * semaphore and locks writers out if this is the first concurrent reader txn starting up.
      */
     private void startRead() {
-        mTurnSemaphore.acquireUninterruptibly();
-        mTurnSemaphore.release();
-
-        if (mOngoingReads.incrementAndGet() == 1) {
-            // First one in. Wait for writers to finish and lock them out.
-            mWriteLock.acquireUninterruptibly();
-        }
-    }
+        turnSemaphore.acquireUninterruptibly();
+        turnSemaphore.release();
 
-    /**
-     * An alternative to startWrite to be used when in a read transaction and wanting to upgrade it
-     * to a write transaction. Such a transaction should be terminated with finishWrite.
-     */
-    private void upgradeReadToWrite() {
-        mTurnSemaphore.acquireUninterruptibly();
-        if (mOngoingReads.decrementAndGet() == 0) {
-            mWriteLock.release();
+        if (ongoingReads.incrementAndGet() == 1) {
+            // First one in. Wait for writers to finish and lock them out.
+            writeLock.acquireUninterruptibly();
         }
-        mWriteLock.acquireUninterruptibly();
     }
 
     /**
      * Called by transactions performing only reads as they finish. Ensures that if this is the last
      * concluding read transaction then then writers are subsequently allowed in.
      */
     private void finishRead() {
-        if (mOngoingReads.decrementAndGet() == 0) {
-            mWriteLock.release();
+        if (ongoingReads.decrementAndGet() == 0) {
+            writeLock.release();
         }
     }
 
     /**
      * Called by writer transactions upon start. Ensures fairness and then obtains the write lock.
      * Upon return, no other txns will be executing concurrently.
      */
     private void startWrite() {
-        mTurnSemaphore.acquireUninterruptibly();
-        mWriteLock.acquireUninterruptibly();
+        turnSemaphore.acquireUninterruptibly();
+        writeLock.acquireUninterruptibly();
     }
 
     /**
      * Called by a concluding write transaction - unlocks the structure.
      */
     private void finishWrite() {
-        mTurnSemaphore.release();
-        mWriteLock.release();
+        turnSemaphore.release();
+        writeLock.release();
     }
 
     public FaviconCache(int maxSize, int maxWidthToCache) {
-        mMaxSizeBytes = maxSize;
-        mMaxCachedWidth = maxWidthToCache;
+        maxSizeBytes = maxSize;
+        maxCachedWidth = maxWidthToCache;
     }
 
     /**
      * Determine if the provided favicon URL is marked as a failure (Has failed to load before -
      * such icons get blacklisted for a time to prevent us endlessly retrying.)
      *
      * @param faviconURL Favicon URL to check if failed in memcache.
      * @return true if this favicon is blacklisted, false otherwise.
      */
     public boolean isFailedFavicon(String faviconURL) {
         if (faviconURL == null) {
             return true;
         }
 
         startRead();
 
-        boolean isExpired = false;
-        boolean isAborting = false;
-
         try {
             // If we don't have it in the cache, it certainly isn't a known failure.
             // Non-evictable favicons are never failed, so we don't need to
-            // check mPermanentBackingMap.
-            if (!mBackingMap.containsKey(faviconURL)) {
+            // check permanentBackingMap.
+            if (!backingMap.containsKey(faviconURL)) {
                 return false;
             }
 
-            FaviconsForURL container = mBackingMap.get(faviconURL);
+            FaviconsForURL container = backingMap.get(faviconURL);
 
             // If the has failed flag is not set, it's certainly not a known failure.
-            if (!container.mHasFailed) {
+            if (!container.hasFailed) {
                 return false;
             }
 
-            final long failureTimestamp = container.mDownloadTimestamp;
+            final long failureTimestamp = container.downloadTimestamp;
 
             // Calculate elapsed time since the failing download.
             final long failureDiff = System.currentTimeMillis() - failureTimestamp;
 
-            // If long enough has passed, mark it as no longer a failure.
-            if (failureDiff > FAILURE_RETRY_MILLISECONDS) {
-                isExpired = true;
-            } else {
+            // If the expiry is still in effect, return. Otherwise, continue and unmark the failure.
+            if (failureDiff < FAILURE_RETRY_MILLISECONDS) {
                 return true;
             }
         } catch (Exception unhandled) {
-            // Handle any exception thrown and return the locks to a sensible state.
-            finishRead();
-
-            // Flag to prevent finally from doubly-unlocking.
-            isAborting = true;
             Log.e(LOGTAG, "FaviconCache exception!", unhandled);
             return true;
         }  finally {
-            if (!isAborting) {
-                if (isExpired) {
-                    // No longer expired.
-                    upgradeReadToWrite();
-                } else {
-                    finishRead();
-                }
-            }
+            finishRead();
         }
 
+        startWrite();
+
+        // If the entry is no longer failed, remove the record of it from the cache.
         try {
-            recordRemoved(mBackingMap.get(faviconURL));
-            mBackingMap.remove(faviconURL);
+            recordRemoved(backingMap.remove(faviconURL));
             return false;
         } finally {
             finishWrite();
         }
     }
 
     /**
      * Mark the indicated page URL as a failed Favicon until the provided time.
      *
      * @param faviconURL Page URL for which a Favicon load has failed.
      */
     public void putFailed(String faviconURL) {
         startWrite();
 
-        if (mBackingMap.containsKey(faviconURL)) {
-            recordRemoved(mBackingMap.get(faviconURL));
+        try {
+            FaviconsForURL container = new FaviconsForURL(0, true);
+            recordRemoved(backingMap.put(faviconURL, container));
+        } finally {
+            finishWrite();
         }
-
-        FaviconsForURL container = new FaviconsForURL(0, true);
-        mBackingMap.put(faviconURL, container);
-
-        finishWrite();
     }
 
     /**
      * Fetch a Favicon for the given URL as close as possible to the size provided.
      * If an icon of the given size is already in the cache, it is returned.
      * If an icon of the given size is not in the cache but a larger unscaled image does exist in
      * the cache, we downscale the larger image to the target size and cache the result.
      * If there is no image of the required size, null is returned.
@@ -304,88 +275,81 @@ public class FaviconCache {
      * @return A favicon of the requested size for the requested URL, or null if none cached.
      */
     public Bitmap getFaviconForDimensions(String faviconURL, int targetSize) {
         if (faviconURL == null) {
             Log.e(LOGTAG, "You passed a null faviconURL to getFaviconForDimensions. Don't.");
             return null;
         }
 
-        boolean doingWrites = false;
         boolean shouldComputeColour = false;
-        boolean isAborting = false;
         boolean wasPermanent = false;
         FaviconsForURL container;
         final Bitmap newBitmap;
 
         startRead();
 
         try {
-            container = mPermanentBackingMap.get(faviconURL);
+            container = permanentBackingMap.get(faviconURL);
             if (container == null) {
-                container = mBackingMap.get(faviconURL);
+                container = backingMap.get(faviconURL);
                 if (container == null) {
                     // We don't have it!
                     return null;
                 }
             } else {
                 wasPermanent = true;
             }
 
             FaviconCacheElement cacheElement;
 
             // If targetSize is -1, it means we want the largest possible icon.
             int cacheElementIndex = (targetSize == -1) ? -1 : container.getNextHighestIndex(targetSize);
 
             // cacheElementIndex now holds either the index of the next least largest bitmap from
             // targetSize, or -1 if targetSize > all bitmaps.
             if (cacheElementIndex != -1) {
-                // If cacheElementIndex is not the sentinel value, then it is a valid index into mFavicons.
-                cacheElement = container.mFavicons.get(cacheElementIndex);
+                // If cacheElementIndex is not the sentinel value, then it is a valid index into favicons.
+                cacheElement = container.favicons.get(cacheElementIndex);
 
-                if (cacheElement.mInvalidated) {
+                if (cacheElement.invalidated) {
                     return null;
                 }
 
                 // If we found exactly what we wanted - we're done.
-                if (cacheElement.mImageSize == targetSize) {
-                    setMostRecentlyUsed(cacheElement);
-                    return cacheElement.mFaviconPayload;
+                if (cacheElement.imageSize == targetSize) {
+                    setMostRecentlyUsedWithinRead(cacheElement);
+                    return cacheElement.faviconPayload;
                 }
             } else {
                 // We requested an image larger than all primaries. Set the element to start the search
                 // from to the element beyond the end of the array, so the search runs backwards.
-                cacheElementIndex = container.mFavicons.size();
+                cacheElementIndex = container.favicons.size();
             }
 
             // We did not find exactly what we wanted, but now have set cacheElementIndex to the index
             // where what we want should live in the list. We now request the next least larger primary
             // from the cache. We will downscale this to our target size.
 
             // If there is no such primary, we'll upscale the next least smaller one instead.
             cacheElement = container.getNextPrimary(cacheElementIndex);
 
             if (cacheElement == null) {
                 // The primary has been invalidated! Fail! Need to get it back from the database.
                 return null;
             }
 
             if (targetSize == -1) {
                 // We got the biggest primary, so that's what we'll return.
-                return cacheElement.mFaviconPayload;
+                return cacheElement.faviconPayload;
             }
 
-            // Having got this far, we'll be needing to write the new secondary to the cache, which
-            // involves us falling through to the next try block. This flag lets us do this (Other
-            // paths prior to this end in returns.)
-            doingWrites = true;
-
             // Scaling logic...
-            Bitmap largestElementBitmap = cacheElement.mFaviconPayload;
-            int largestSize = cacheElement.mImageSize;
+            Bitmap largestElementBitmap = cacheElement.faviconPayload;
+            int largestSize = cacheElement.imageSize;
 
             if (largestSize >= targetSize) {
                 // The largest we have is larger than the target - downsize to target.
                 newBitmap = Bitmap.createScaledBitmap(largestElementBitmap, targetSize, targetSize, true);
             } else {
                 // Our largest primary is smaller than the desired size. Upscale by a maximum of 2x.
                 // largestSize now reflects the maximum size we can upscale to.
                 largestSize *= 2;
@@ -396,49 +360,42 @@ public class FaviconCache {
                 } else {
                     // We don't have enough information to make the target size look nonterrible. Best effort:
                     newBitmap = Bitmap.createScaledBitmap(largestElementBitmap, largestSize, largestSize, true);
 
                     shouldComputeColour = true;
                 }
             }
         } catch (Exception unhandled) {
-            isAborting = true;
-
             // Handle any exception thrown and return the locks to a sensible state.
-            finishRead();
 
             // Flag to prevent finally from doubly-unlocking.
             Log.e(LOGTAG, "FaviconCache exception!", unhandled);
             return null;
         } finally {
-            if (!isAborting) {
-                if (doingWrites) {
-                    upgradeReadToWrite();
-                } else {
-                    finishRead();
-                }
-            }
+            finishRead();
         }
 
+        startWrite();
         try {
             if (shouldComputeColour) {
                 // And since we failed, we'll need the dominant colour.
                 container.ensureDominantColor();
             }
 
             // While the image might not actually BE that size, we set the size field to the target
             // because this is the best image you can get for a request of that size using the Favicon
             // information provided by this website.
             // This way, subsequent requests hit straight away.
             FaviconCacheElement newElement = container.addSecondary(newBitmap, targetSize);
 
             if (!wasPermanent) {
-                setMostRecentlyUsed(newElement);
-                mCurrentSize.addAndGet(newElement.sizeOf());
+                if (setMostRecentlyUsedWithinWrite(newElement)) {
+                    currentSize.addAndGet(newElement.sizeOf());
+                }
             }
         } finally {
             finishWrite();
         }
 
         return newBitmap;
     }
 
@@ -447,83 +404,101 @@ public class FaviconCache {
      *
      * @param key The URL of the Favicon for which a dominant colour is desired.
      * @return The cached dominant colour, or null if none is cached.
      */
     public int getDominantColor(String key) {
         startRead();
 
         try {
-            FaviconsForURL element = mPermanentBackingMap.get(key);
+            FaviconsForURL element = permanentBackingMap.get(key);
             if (element == null) {
-                element = mBackingMap.get(key);
+                element = backingMap.get(key);
             }
 
             if (element == null) {
                 Log.w(LOGTAG, "Cannot compute dominant color of non-cached favicon. Cache fullness " +
-                              mCurrentSize.get() + '/' + mMaxSizeBytes);
+                              currentSize.get() + '/' + maxSizeBytes);
                 finishRead();
                 return 0xFFFFFF;
             }
 
-
             return element.ensureDominantColor();
         } finally {
             finishRead();
         }
     }
 
     /**
-     * Remove all payloads stored in the given container from the LRU cache. Must be called while
-     * holding the write lock.
+     * Remove all payloads stored in the given container from the LRU cache.
+     * Must be called while holding the write lock.
      *
      * @param wasRemoved The container to purge from the cache.
      */
     private void recordRemoved(FaviconsForURL wasRemoved) {
         // If there was an existing value, strip it from the insertion-order cache.
         if (wasRemoved == null) {
             return;
         }
 
         int sizeRemoved = 0;
 
-        for (FaviconCacheElement e : wasRemoved.mFavicons) {
+        for (FaviconCacheElement e : wasRemoved.favicons) {
             sizeRemoved += e.sizeOf();
-            mOrdering.remove(e);
+            ordering.remove(e);
         }
 
-        mCurrentSize.addAndGet(-sizeRemoved);
+        currentSize.addAndGet(-sizeRemoved);
     }
 
     private Bitmap produceCacheableBitmap(Bitmap favicon) {
         // Never cache the default Favicon, or the null Favicon.
-        if (favicon == Favicons.sDefaultFavicon || favicon == null) {
+        if (favicon == Favicons.defaultFavicon || favicon == null) {
             return null;
         }
 
         // Some sites serve up insanely huge Favicons (Seen 512x512 ones...)
         // While we want to cache nice big icons, we apply a limit based on screen density for the
         // sake of space.
-        if (favicon.getWidth() > mMaxCachedWidth) {
-            return Bitmap.createScaledBitmap(favicon, mMaxCachedWidth, mMaxCachedWidth, true);
+        if (favicon.getWidth() > maxCachedWidth) {
+            return Bitmap.createScaledBitmap(favicon, maxCachedWidth, maxCachedWidth, true);
         }
+
         return favicon;
     }
 
     /**
-     * Set an existing element as the most recently used element. May be called from either type of
-     * transaction.
+     * Set an existing element as the most recently used element. Intended for use from read transactions. While
+     * write transactions may safely use this method, it will perform slightly worse than its unsafe counterpart below.
      *
      * @param element The element that is to become the most recently used one.
+     * @return true if this element already existed in the list, false otherwise. (Useful for preventing multiple-insertion.)
      */
-    private void setMostRecentlyUsed(FaviconCacheElement element) {
-        mReorderingSemaphore.acquireUninterruptibly();
-        mOrdering.remove(element);
-        mOrdering.offer(element);
-        mReorderingSemaphore.release();
+    private boolean setMostRecentlyUsedWithinRead(FaviconCacheElement element) {
+        reorderingSemaphore.acquireUninterruptibly();
+        try {
+            boolean contained = ordering.remove(element);
+            ordering.offer(element);
+            return contained;
+        } finally {
+            reorderingSemaphore.release();
+        }
+    }
+
+    /**
+     * Functionally equivalent to setMostRecentlyUsedWithinRead, but operates without taking the reordering semaphore.
+     * Only safe for use when called from a write transaction, or there is a risk of concurrent modification.
+     *
+     * @param element The element that is to become the most recently used one.
+     * @return true if this element already existed in the list, false otherwise. (Useful for preventing multiple-insertion.)
+     */
+    private boolean setMostRecentlyUsedWithinWrite(FaviconCacheElement element) {
+        boolean contained = ordering.remove(element);
+        ordering.offer(element);
+        return contained;
     }
 
     /**
      * Add the provided bitmap to the cache as the only available primary for this URL.
      * Should never be called with scaled Favicons. The input is assumed to be an unscaled Favicon.
      *
      * @param faviconURL The URL of the Favicon being stored.
      * @param aFavicon The Favicon to store.
@@ -541,23 +516,23 @@ public class FaviconCache {
         FaviconsForURL toInsert = new FaviconsForURL(NUM_FAVICON_SIZES);
 
         // Create the cache element for the single element we are inserting, and configure it.
         FaviconCacheElement newElement = toInsert.addPrimary(favicon);
 
         startWrite();
         try {
             // Set the new element as the most recently used one.
-            setMostRecentlyUsed(newElement);
+            setMostRecentlyUsedWithinWrite(newElement);
 
-            mCurrentSize.addAndGet(newElement.sizeOf());
+            currentSize.addAndGet(newElement.sizeOf());
 
             // Update the value in the LruCache...
             FaviconsForURL wasRemoved;
-            wasRemoved = mBackingMap.put(faviconURL, toInsert);
+            wasRemoved = backingMap.put(faviconURL, toInsert);
 
             recordRemoved(wasRemoved);
         } finally {
             finishWrite();
         }
 
         cullIfRequired();
     }
@@ -579,97 +554,78 @@ public class FaviconCache {
             if (favicon == null) {
                 continue;
             }
 
             FaviconCacheElement newElement = toInsert.addPrimary(favicon);
             sizeGained += newElement.sizeOf();
         }
 
-        startRead();
-
-        boolean abortingRead = false;
-
-        // Not using setMostRecentlyUsed, because the elements are known to be new. This can be done
-        // without taking the write lock, via the magic of the reordering semaphore.
-        mReorderingSemaphore.acquireUninterruptibly();
-        try {
-            if (!permanently) {
-                for (FaviconCacheElement newElement : toInsert.mFavicons) {
-                    mOrdering.offer(newElement);
-                }
-            }
-        } catch (Exception e) {
-            abortingRead = true;
-            mReorderingSemaphore.release();
-            finishRead();
-
-            Log.e(LOGTAG, "Favicon cache exception!", e);
-            return;
-        } finally {
-            if (!abortingRead) {
-                mReorderingSemaphore.release();
-                upgradeReadToWrite();
-            }
-        }
-
+        startWrite();
         try {
             if (permanently) {
-                mPermanentBackingMap.put(faviconURL, toInsert);
-            } else {
-                mCurrentSize.addAndGet(sizeGained);
+                permanentBackingMap.put(faviconURL, toInsert);
+                return;
+            }
 
-                // Update the value in the LruCache...
-                recordRemoved(mBackingMap.put(faviconURL, toInsert));
+            for (FaviconCacheElement newElement : toInsert.favicons) {
+                setMostRecentlyUsedWithinWrite(newElement);
             }
+
+            // In the event this insertion is being made to a key that already held a value, the subsequent recordRemoved
+            // call will subtract the size of the old value, preventing double-counting.
+            currentSize.addAndGet(sizeGained);
+
+            // Update the value in the LruCache...
+            recordRemoved(backingMap.put(faviconURL, toInsert));
         } finally {
             finishWrite();
         }
 
         cullIfRequired();
     }
 
     /**
      * If cache too large, drop stuff from the cache to get the size back into the acceptable range.
      * Otherwise, do nothing.
      */
     private void cullIfRequired() {
-        Log.d(LOGTAG, "Favicon cache fullness: " + mCurrentSize.get() + '/' + mMaxSizeBytes);
+        Log.d(LOGTAG, "Favicon cache fullness: " + currentSize.get() + '/' + maxSizeBytes);
 
-        if (mCurrentSize.get() <= mMaxSizeBytes) {
+        if (currentSize.get() <= maxSizeBytes) {
             return;
         }
 
         startWrite();
         try {
-            while (mCurrentSize.get() > mMaxSizeBytes) {
+            while (currentSize.get() > maxSizeBytes) {
                 // Cull the least recently used element.
 
                 FaviconCacheElement victim;
-                victim = mOrdering.poll();
+                victim = ordering.poll();
 
-                mCurrentSize.addAndGet(-victim.sizeOf());
+                currentSize.addAndGet(-victim.sizeOf());
                 victim.onEvictedFromCache();
 
-                Log.d(LOGTAG, "After cull: " + mCurrentSize.get() + '/' + mMaxSizeBytes);
+                Log.d(LOGTAG, "After cull: " + currentSize.get() + '/' + maxSizeBytes);
             }
         } finally {
             finishWrite();
         }
     }
 
     /**
      * Purge all elements from the FaviconCache. Handy if you want to reclaim some memory.
      */
     public void evictAll() {
         startWrite();
 
         // Note that we neither clear, nor track the size of, the permanent map.
         try {
-            mCurrentSize.set(0);
-            mBackingMap.clear();
-            mOrdering.clear();
+            currentSize.set(0);
+            backingMap.clear();
+            ordering.clear();
 
         } finally {
             finishWrite();
         }
     }
 }

--- a/mobile/android/base/favicons/cache/FaviconCacheElement.java
+++ b/mobile/android/base/favicons/cache/FaviconCacheElement.java
@@ -7,109 +7,109 @@ package org.mozilla.gecko.favicons.cache
 import android.graphics.Bitmap;
 
 /**
  * Objects stored in the Favicon cache - allow for the bitmap to be tagged to indicate if it has
  * been scaled. Unscaled bitmaps are not included in the scaled-bitmap cache's size calculation.
  */
 public class FaviconCacheElement implements Comparable<FaviconCacheElement> {
     // Was this Favicon computed via scaling another primary Favicon, or is this a primary Favicon?
-    final boolean mIsPrimary;
+    final boolean isPrimary;
 
     // The Favicon bitmap.
-    Bitmap mFaviconPayload;
+    Bitmap faviconPayload;
 
-    // If set, mFaviconPayload is absent. Since the underlying ICO may contain multiple primary
+    // If set, faviconPayload is absent. Since the underlying ICO may contain multiple primary
     // payloads, primary payloads are never truly deleted from the cache, but instead have their
     // payload deleted and this flag set on their FaviconCacheElement. That way, the cache always
     // has a record of the existence of a primary payload, even if it is no longer in the cache.
     // This means that when a request comes in that will be best served using a primary that is in
     // the database but no longer cached, we know that it exists and can go get it (Useful when ICO
     // support is added).
-    volatile boolean mInvalidated;
+    volatile boolean invalidated;
 
-    final int mImageSize;
+    final int imageSize;
 
     // Used for LRU pruning.
-    final FaviconsForURL mBackpointer;
+    final FaviconsForURL backpointer;
 
-    public FaviconCacheElement(Bitmap payload, boolean isPrimary, int imageSize, FaviconsForURL backpointer) {
-        mFaviconPayload = payload;
-        mIsPrimary = isPrimary;
-        mImageSize = imageSize;
-        mBackpointer = backpointer;
+    public FaviconCacheElement(Bitmap payload, boolean primary, int size, FaviconsForURL backpointer) {
+        this.faviconPayload = payload;
+        this.isPrimary = primary;
+        this.imageSize = size;
+        this.backpointer = backpointer;
     }
 
-    public FaviconCacheElement(Bitmap payload, boolean isPrimary, FaviconsForURL backpointer) {
-        mFaviconPayload = payload;
-        mIsPrimary = isPrimary;
-        mBackpointer = backpointer;
+    public FaviconCacheElement(Bitmap faviconPayload, boolean isPrimary, FaviconsForURL backpointer) {
+        this.faviconPayload = faviconPayload;
+        this.isPrimary = isPrimary;
+        this.backpointer = backpointer;
 
-        if (payload != null) {
-            mImageSize = payload.getWidth();
+        if (faviconPayload != null) {
+            imageSize = faviconPayload.getWidth();
         } else {
-            mImageSize = 0;
+            imageSize = 0;
         }
     }
 
     public int sizeOf() {
-        if (mInvalidated) {
+        if (invalidated) {
             return 0;
         }
-        return mFaviconPayload.getRowBytes() * mFaviconPayload.getHeight();
+        return faviconPayload.getRowBytes() * faviconPayload.getHeight();
     }
 
     /**
      * Establish an ordering on FaviconCacheElements based on size and validity. An element is
      * considered "greater than" another if it is valid and the other is not, or if it contains a
      * larger payload.
      *
      * @param another The FaviconCacheElement to compare to this one.
      * @return -1 if this element is less than the given one, 1 if the other one is larger than this
      *         and 0 if both are of equal value.
      */
     @Override
     public int compareTo(FaviconCacheElement another) {
-        if (mInvalidated && !another.mInvalidated) {
+        if (invalidated && !another.invalidated) {
             return -1;
         }
 
-        if (!mInvalidated && another.mInvalidated) {
+        if (!invalidated && another.invalidated) {
             return 1;
         }
 
-        if (mInvalidated) {
+        if (invalidated) {
             return 0;
         }
 
-        final int w1 = mImageSize;
-        final int w2 = another.mImageSize;
+        final int w1 = imageSize;
+        final int w2 = another.imageSize;
         if (w1 > w2) {
             return 1;
         } else if (w2 > w1) {
             return -1;
         }
         return 0;
     }
 
     /**
      * Called when this element is evicted from the cache.
      *
      * If primary, drop the payload and set invalid. If secondary, just unlink from parent node.
      */
     public void onEvictedFromCache() {
-        if (mIsPrimary) {
+        if (isPrimary) {
             // So we keep a record of which primaries exist in the database for this URL, we
             // don't actually delete the entry for primaries. Instead, we delete their payload
             // and flag them as invalid. This way, we can later figure out that what a request
             // really want is one of the primaries that have been dropped from the cache, and we
             // can go get it.
-            mInvalidated = true;
-            mFaviconPayload = null;
+            invalidated = true;
+            faviconPayload = null;
         } else {
             // Secondaries don't matter - just delete them.
-            if (mBackpointer == null) {
+            if (backpointer == null) {
                 return;
             }
-            mBackpointer.mFavicons.remove(this);
+            backpointer.favicons.remove(this);
         }
     }
 }

--- a/mobile/android/base/favicons/cache/FaviconsForURL.java
+++ b/mobile/android/base/favicons/cache/FaviconsForURL.java
@@ -9,152 +9,156 @@ import android.util.Log;
 import org.mozilla.gecko.gfx.BitmapUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
 
 public class FaviconsForURL {
     private static final String LOGTAG = "FaviconForURL";
 
-    private volatile int mDominantColor = -1;
+    private volatile int dominantColor = -1;
 
-    final long mDownloadTimestamp;
-    final ArrayList<FaviconCacheElement> mFavicons;
+    final long downloadTimestamp;
+    final ArrayList<FaviconCacheElement> favicons;
 
-    public final boolean mHasFailed;
+    public final boolean hasFailed;
 
     public FaviconsForURL(int size) {
         this(size, false);
     }
 
-    public FaviconsForURL(int size, boolean hasFailed) {
-        mHasFailed = hasFailed;
-        mDownloadTimestamp = System.currentTimeMillis();
-        mFavicons = new ArrayList<FaviconCacheElement>(size);
+    public FaviconsForURL(int size, boolean failed) {
+        hasFailed = failed;
+        downloadTimestamp = System.currentTimeMillis();
+        favicons = new ArrayList<FaviconCacheElement>(size);
     }
 
     public FaviconCacheElement addSecondary(Bitmap favicon, int imageSize) {
         return addInternal(favicon, false, imageSize);
     }
 
     public FaviconCacheElement addPrimary(Bitmap favicon) {
         return addInternal(favicon, true, favicon.getWidth());
     }
 
     private FaviconCacheElement addInternal(Bitmap favicon, boolean isPrimary, int imageSize) {
         FaviconCacheElement c = new FaviconCacheElement(favicon, isPrimary, imageSize, this);
 
-        int index = Collections.binarySearch(mFavicons, c);
+        int index = Collections.binarySearch(favicons, c);
+
+        // We've already got an equivalent one. We don't care about this new one. This only occurs in certain obscure
+        // case conditions.
+        if (index >= 0) {
+            return favicons.get(index);
+        }
 
         // binarySearch returns -x - 1 where x is the insertion point of the element. Convert
         // this to the actual insertion point..
-        if (index < 0) {
-            index++;
-            index = -index;
-        }
-        mFavicons.add(index, c);
+        index++;
+        index = -index;
+        favicons.add(index, c);
 
         return c;
     }
 
     /**
      * Get the index of the smallest image in this collection larger than or equal to
      * the given target size.
      *
      * @param targetSize Minimum size for the desired result.
      * @return The index of the smallest image larger than the target size, or -1 if none exists.
      */
     public int getNextHighestIndex(int targetSize) {
         // Create a dummy object to hold the target value for comparable.
         FaviconCacheElement dummy = new FaviconCacheElement(null, false, targetSize, null);
 
-        int index = Collections.binarySearch(mFavicons, dummy);
+        int index = Collections.binarySearch(favicons, dummy);
 
         // The search routine returns the index of an element equal to dummy, if present.
         // Otherwise, it returns -x - 1, where x is the index in the ArrayList where dummy would be
         // inserted if the list were to remain sorted.
         if (index < 0) {
             index++;
             index = -index;
         }
 
         // index is now 'x', as described above.
 
-        // The routine will return mFavicons.size() as the index iff dummy is larger than all elements
+        // The routine will return favicons.size() as the index iff dummy is larger than all elements
         // present (So the "index at which it should be inserted" is the index after the end.
         // In this case, we set the sentinel value -1 to indicate that we just requested something
         // larger than all primaries.
-        if (index == mFavicons.size()) {
+        if (index == favicons.size()) {
             index = -1;
         }
 
         return index;
     }
 
     /**
      * Get the next valid primary icon from this collection, starting at the given index.
      * If the appropriate icon is found, but is invalid, we return null - the proper response is to
      * reacquire the primary from the database.
      * If no icon is found, the search is repeated going backwards from the start index to find any
      * primary at all (The input index may be a secondary which is larger than the actual available
      * primary.)
      *
-     * @param fromIndex The index into mFavicons from which to start the search.
+     * @param fromIndex The index into favicons from which to start the search.
      * @return The FaviconCacheElement of the next valid primary from the given index. If none exists,
      *         then returns the previous valid primary. If none exists, returns null (Insanity.).
      */
     public FaviconCacheElement getNextPrimary(final int fromIndex) {
-        final int numIcons = mFavicons.size();
+        final int numIcons = favicons.size();
 
         int searchIndex = fromIndex;
         while (searchIndex < numIcons) {
-            FaviconCacheElement element = mFavicons.get(searchIndex);
+            FaviconCacheElement element = favicons.get(searchIndex);
 
-            if (element.mIsPrimary) {
-                if (element.mInvalidated) {
+            if (element.isPrimary) {
+                if (element.invalidated) {
                     // We return null here, despite the possible existence of other primaries,
                     // because we know the most suitable primary for this request exists, but is
                     // no longer in the cache. By returning null, we cause the caller to load the
                     // missing primary from the database and call again.
                     return null;
                 }
                 return element;
             }
             searchIndex++;
         }
 
         // No larger primary available. Let's look for smaller ones...
         searchIndex = fromIndex - 1;
         while (searchIndex >= 0) {
-            FaviconCacheElement element = mFavicons.get(searchIndex);
+            FaviconCacheElement element = favicons.get(searchIndex);
 
-            if (element.mIsPrimary) {
-                if (element.mInvalidated) {
+            if (element.isPrimary) {
+                if (element.invalidated) {
                     return null;
                 }
                 return element;
             }
             searchIndex--;
         }
 
         Log.e(LOGTAG, "No primaries found in Favicon cache structure. This is madness!");
 
         return null;
     }
 
     /**
      * Ensure the dominant colour field is populated for this favicon.
      */
     public int ensureDominantColor() {
-        if (mDominantColor == -1) {
+        if (dominantColor == -1) {
             // Find a payload, any payload, that is not invalidated.
-            for (FaviconCacheElement element : mFavicons) {
-                if (!element.mInvalidated) {
-                    mDominantColor = BitmapUtils.getDominantColor(element.mFaviconPayload);
-                    return mDominantColor;
+            for (FaviconCacheElement element : favicons) {
+                if (!element.invalidated) {
+                    dominantColor = BitmapUtils.getDominantColor(element.faviconPayload);
+                    return dominantColor;
                 }
             }
-            mDominantColor = 0xFFFFFF;
+            dominantColor = 0xFFFFFF;
         }
 
-        return mDominantColor;
+        return dominantColor;
     }
 }

--- a/mobile/android/base/favicons/decoders/FaviconDecoder.java
+++ b/mobile/android/base/favicons/decoders/FaviconDecoder.java
@@ -84,24 +84,24 @@ public class FaviconDecoder {
      * @param length The length of the region in the array to decode.
      * @return The decoded version of the bitmap in the described region, or null if none can be
      *         decoded.
      */
     public static LoadFaviconResult decodeFavicon(byte[] buffer, int offset, int length) {
         LoadFaviconResult result;
         if (isDecodableByAndroid(buffer, offset)) {
             result = new LoadFaviconResult();
-            result.mOffset = offset;
-            result.mLength = length;
-            result.mIsICO = false;
+            result.offset = offset;
+            result.length = length;
+            result.isICO = false;
 
             // We assume here that decodeByteArray doesn't hold on to the entire supplied
             // buffer -- worst case, each of our buffers will be twice the necessary size.
-            result.mBitmapsDecoded = new SingleBitmapIterator(BitmapUtils.decodeByteArray(buffer, offset, length));
-            result.mFaviconBytes = buffer;
+            result.bitmapsDecoded = new SingleBitmapIterator(BitmapUtils.decodeByteArray(buffer, offset, length));
+            result.faviconBytes = buffer;
 
             return result;
         }
 
         // If it's not decodable by Android, it might be an ICO. Let's try.
         ICODecoder decoder = new ICODecoder(buffer, offset, length);
 
         result = decoder.decode();
@@ -188,46 +188,46 @@ public class FaviconDecoder {
 
         return bitmap;
     }
 
     /**
      * Iterator to hold a single bitmap.
      */
     static class SingleBitmapIterator implements Iterator<Bitmap> {
-        private Bitmap mBitmap;
+        private Bitmap bitmap;
 
         public SingleBitmapIterator(Bitmap b) {
-            mBitmap = b;
+            bitmap = b;
         }
 
         /**
          * Slightly cheating here - this iterator supports peeking (Handy in a couple of obscure
          * places where the runtime type of the Iterator under consideration is known and
          * destruction of it is discouraged.
          *
          * @return The bitmap carried by this SingleBitmapIterator.
          */
         public Bitmap peek() {
-            return mBitmap;
+            return bitmap;
         }
 
         @Override
         public boolean hasNext() {
-            return mBitmap != null;
+            return bitmap != null;
         }
 
         @Override
         public Bitmap next() {
-            if (mBitmap == null) {
+            if (bitmap == null) {
                 throw new NoSuchElementException("Element already returned from SingleBitmapIterator.");
             }
 
-            Bitmap ret = mBitmap;
-            mBitmap = null;
+            Bitmap ret = bitmap;
+            bitmap = null;
             return ret;
         }
 
         @Override
         public void remove() {
             throw new UnsupportedOperationException("remove() not supported on SingleBitmapIterator.");
         }
     }

--- a/mobile/android/base/favicons/decoders/ICODecoder.java
+++ b/mobile/android/base/favicons/decoders/ICODecoder.java
@@ -5,17 +5,16 @@
 package org.mozilla.gecko.favicons.decoders;
 
 import android.graphics.Bitmap;
 import org.mozilla.gecko.favicons.Favicons;
 import org.mozilla.gecko.gfx.BitmapUtils;
 
 import android.util.SparseArray;
 
-import java.util.Collection;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 /**
  * Utility class for determining the region of a provided array which contains the largest bitmap,
  * assuming the provided array is a valid ICO and the bitmap desired is square, and for pruning
  * unwanted entries from ICO files, if desired.
  *
@@ -74,229 +73,229 @@ public class ICODecoder implements Itera
     // The number of bytes that compacting will save for us to bother doing it.
     public static final int COMPACT_THRESHOLD = 4000;
 
     // Some geometry of an ICO file.
     public static final int ICO_HEADER_LENGTH_BYTES = 6;
     public static final int ICO_ICONDIRENTRY_LENGTH_BYTES = 16;
 
     // The buffer containing bytes to attempt to decode.
-    private byte[] mDecodand;
+    private byte[] decodand;
 
     // The region of the decodand to decode.
-    private int mOffset;
-    private int mLen;
+    private int offset;
+    private int len;
 
-    private IconDirectoryEntry[] mIconDirectory;
-    private boolean mIsValid;
-    private boolean mHasDecoded;
+    private IconDirectoryEntry[] iconDirectory;
+    private boolean isValid;
+    private boolean hasDecoded;
 
-    public ICODecoder(byte[] buffer, int offset, int len) {
-        mDecodand = buffer;
-        mOffset = offset;
-        mLen = len;
+    public ICODecoder(byte[] decodand, int offset, int len) {
+        this.decodand = decodand;
+        this.offset = offset;
+        this.len = len;
     }
 
     /**
-     * Decode the Icon Directory for this ICO and store the result in mIconDirectory.
+     * Decode the Icon Directory for this ICO and store the result in iconDirectory.
      *
      * @return true if ICO decoding was considered to probably be a success, false if it certainly
      *         was a failure.
      */
     private boolean decodeIconDirectoryAndPossiblyPrune() {
-        mHasDecoded = true;
+        hasDecoded = true;
 
         // Fail if the end of the described range is out of bounds.
-        if (mOffset + mLen > mDecodand.length) {
+        if (offset + len > decodand.length) {
             return false;
         }
 
         // Fail if we don't have enough space for the header.
-        if (mLen < ICO_HEADER_LENGTH_BYTES) {
+        if (len < ICO_HEADER_LENGTH_BYTES) {
             return false;
         }
 
         // Check that the reserved fields in the header are indeed zero, and that the type field
         // specifies ICO. If not, we've probably been given something that isn't really an ICO.
-        if (mDecodand[mOffset] != 0 ||
-            mDecodand[mOffset + 1] != 0 ||
-            mDecodand[mOffset + 2] != 1 ||
-            mDecodand[mOffset + 3] != 0) {
+        if (decodand[offset] != 0 ||
+            decodand[offset + 1] != 0 ||
+            decodand[offset + 2] != 1 ||
+            decodand[offset + 3] != 0) {
             return false;
         }
 
         // Here, and in many other places, byte values are ANDed with 0xFF. This is because Java
         // bytes are signed - to obtain a numerical value of a longer type which holds the unsigned
         // interpretation of the byte of interest, we do this.
-        int numEncodedImages = (mDecodand[mOffset + 4] & 0xFF) |
-                               (mDecodand[mOffset + 5] & 0xFF) << 8;
+        int numEncodedImages = (decodand[offset + 4] & 0xFF) |
+                               (decodand[offset + 5] & 0xFF) << 8;
 
 
         // Fail if there are no images or the field is corrupt.
         if (numEncodedImages <= 0) {
             return false;
         }
 
         final int headerAndDirectorySize = ICO_HEADER_LENGTH_BYTES + (numEncodedImages * ICO_ICONDIRENTRY_LENGTH_BYTES);
 
         // Fail if there is not enough space in the buffer for the stated number of icondir entries,
         // let alone the data.
-        if (mLen < headerAndDirectorySize) {
+        if (len < headerAndDirectorySize) {
             return false;
         }
 
         // Put the pointer on the first byte of the first Icon Directory Entry.
-        int bufferIndex = mOffset + ICO_HEADER_LENGTH_BYTES;
+        int bufferIndex = offset + ICO_HEADER_LENGTH_BYTES;
 
         // We now iterate over the Icon Directory, decoding each entry as we go. We also need to
         // discard all entries except one >= the maximum interesting size.
 
         // Size of the smallest image larger than the limit encountered.
         int minimumMaximum = Integer.MAX_VALUE;
 
         // Used to track the best entry for each size. The entries we want to keep.
         SparseArray<IconDirectoryEntry> preferenceArray = new SparseArray<IconDirectoryEntry>();
 
         for (int i = 0; i < numEncodedImages; i++, bufferIndex += ICO_ICONDIRENTRY_LENGTH_BYTES) {
             // Decode the Icon Directory Entry at this offset.
-            IconDirectoryEntry newEntry = IconDirectoryEntry.createFromBuffer(mDecodand, mOffset, mLen, bufferIndex);
-            newEntry.mIndex = i;
+            IconDirectoryEntry newEntry = IconDirectoryEntry.createFromBuffer(decodand, offset, len, bufferIndex);
+            newEntry.index = i;
 
-            if (newEntry.mIsErroneous) {
+            if (newEntry.isErroneous) {
                 continue;
             }
 
-            if (newEntry.mWidth > Favicons.sLargestFaviconSize) {
+            if (newEntry.width > Favicons.largestFaviconSize) {
                 // If we already have a smaller image larger than the maximum size of interest, we
                 // don't care about the new one which is larger than the smallest image larger than
                 // the maximum size.
-                if (newEntry.mWidth >= minimumMaximum) {
+                if (newEntry.width >= minimumMaximum) {
                     continue;
                 }
 
                 // Remove the previous minimum-maximum.
                 preferenceArray.delete(minimumMaximum);
 
-                minimumMaximum = newEntry.mWidth;
+                minimumMaximum = newEntry.width;
             }
 
-            IconDirectoryEntry oldEntry = preferenceArray.get(newEntry.mWidth);
+            IconDirectoryEntry oldEntry = preferenceArray.get(newEntry.width);
             if (oldEntry == null) {
-                preferenceArray.put(newEntry.mWidth, newEntry);
+                preferenceArray.put(newEntry.width, newEntry);
                 continue;
             }
 
             if (oldEntry.compareTo(newEntry) < 0) {
-                preferenceArray.put(newEntry.mWidth, newEntry);
+                preferenceArray.put(newEntry.width, newEntry);
             }
         }
 
         final int count = preferenceArray.size();
 
         // Abort if no entries are desired (Perhaps all are corrupt?)
         if (count == 0) {
             return false;
         }
 
         // Allocate space for the icon directory entries in the decoded directory.
-        mIconDirectory = new IconDirectoryEntry[count];
+        iconDirectory = new IconDirectoryEntry[count];
 
         // The size of the data in the buffer that we find useful.
         int retainedSpace = ICO_HEADER_LENGTH_BYTES;
 
         for (int i = 0; i < count; i++) {
             IconDirectoryEntry e = preferenceArray.valueAt(i);
-            retainedSpace += ICO_ICONDIRENTRY_LENGTH_BYTES + e.mPayloadSize;
-            mIconDirectory[i] = e;
+            retainedSpace += ICO_ICONDIRENTRY_LENGTH_BYTES + e.payloadSize;
+            iconDirectory[i] = e;
         }
 
-        mIsValid = true;
+        isValid = true;
 
         // Set the number of images field in the buffer to reflect the number of retained entries.
-        mDecodand[mOffset + 4] = (byte) mIconDirectory.length;
-        mDecodand[mOffset + 5] = (byte) (mIconDirectory.length >>> 8);
+        decodand[offset + 4] = (byte) iconDirectory.length;
+        decodand[offset + 5] = (byte) (iconDirectory.length >>> 8);
 
-        if ((mLen - retainedSpace) > COMPACT_THRESHOLD) {
+        if ((len - retainedSpace) > COMPACT_THRESHOLD) {
             compactingCopy(retainedSpace);
         }
 
         return true;
     }
 
     /**
      * Copy the buffer into a new array of exactly the required size, omitting any unwanted data.
      */
     private void compactingCopy(int spaceRetained) {
         byte[] buf = new byte[spaceRetained];
 
         // Copy the header.
-        System.arraycopy(mDecodand, mOffset, buf, 0, ICO_HEADER_LENGTH_BYTES);
+        System.arraycopy(decodand, offset, buf, 0, ICO_HEADER_LENGTH_BYTES);
 
         int headerPtr = ICO_HEADER_LENGTH_BYTES;
 
-        int payloadPtr = ICO_HEADER_LENGTH_BYTES + (mIconDirectory.length * ICO_ICONDIRENTRY_LENGTH_BYTES);
+        int payloadPtr = ICO_HEADER_LENGTH_BYTES + (iconDirectory.length * ICO_ICONDIRENTRY_LENGTH_BYTES);
 
         int ind = 0;
-        for (IconDirectoryEntry entry : mIconDirectory) {
+        for (IconDirectoryEntry entry : iconDirectory) {
             // Copy this entry.
-            System.arraycopy(mDecodand, mOffset + entry.getOffset(), buf, headerPtr, ICO_ICONDIRENTRY_LENGTH_BYTES);
+            System.arraycopy(decodand, offset + entry.getOffset(), buf, headerPtr, ICO_ICONDIRENTRY_LENGTH_BYTES);
 
             // Copy its payload.
-            System.arraycopy(mDecodand, mOffset + entry.mPayloadOffset, buf, payloadPtr, entry.mPayloadSize);
+            System.arraycopy(decodand, offset + entry.payloadOffset, buf, payloadPtr, entry.payloadSize);
 
             // Update the offset field.
             buf[headerPtr + 12] = (byte) payloadPtr;
             buf[headerPtr + 13] = (byte) (payloadPtr >>> 8);
             buf[headerPtr + 14] = (byte) (payloadPtr >>> 16);
             buf[headerPtr + 15] = (byte) (payloadPtr >>> 24);
 
-            entry.mPayloadOffset = payloadPtr;
-            entry.mIndex = ind;
+            entry.payloadOffset = payloadPtr;
+            entry.index = ind;
 
-            payloadPtr += entry.mPayloadSize;
+            payloadPtr += entry.payloadSize;
             headerPtr += ICO_ICONDIRENTRY_LENGTH_BYTES;
             ind++;
         }
 
-        mDecodand = buf;
-        mOffset = 0;
-        mLen = spaceRetained;
+        decodand = buf;
+        offset = 0;
+        len = spaceRetained;
     }
 
     /**
      * Decode and return the bitmap represented by the given index in the Icon Directory, if valid.
      *
      * @param index The index into the Icon Directory of the image of interest.
      * @return The decoded Bitmap object for this image, or null if the entry is invalid or decoding
      *         fails.
      */
     public Bitmap decodeBitmapAtIndex(int index) {
-        final IconDirectoryEntry iconDirEntry = mIconDirectory[index];
+        final IconDirectoryEntry iconDirEntry = iconDirectory[index];
 
-        if (iconDirEntry.mPayloadIsPNG) {
+        if (iconDirEntry.payloadIsPNG) {
             // PNG payload. Simply extract it and decode it.
-            return BitmapUtils.decodeByteArray(mDecodand, mOffset + iconDirEntry.mPayloadOffset, iconDirEntry.mPayloadSize);
+            return BitmapUtils.decodeByteArray(decodand, offset + iconDirEntry.payloadOffset, iconDirEntry.payloadSize);
         }
 
         // The payload is a BMP, so we need to do some magic to get the decoder to do what we want.
         // We construct an ICO containing just the image we want, and let Android do the rest.
-        byte[] decodeTarget = new byte[ICO_HEADER_LENGTH_BYTES + ICO_ICONDIRENTRY_LENGTH_BYTES + iconDirEntry.mPayloadSize];
+        byte[] decodeTarget = new byte[ICO_HEADER_LENGTH_BYTES + ICO_ICONDIRENTRY_LENGTH_BYTES + iconDirEntry.payloadSize];
 
         // Set the type field in the ICO header.
         decodeTarget[2] = 1;
 
         // Set the num-images field in the header to 1.
         decodeTarget[4] = 1;
 
         // Copy the ICONDIRENTRY we need into the new buffer.
-        System.arraycopy(mDecodand, mOffset + iconDirEntry.getOffset(), decodeTarget, ICO_HEADER_LENGTH_BYTES, ICO_ICONDIRENTRY_LENGTH_BYTES);
+        System.arraycopy(decodand, offset + iconDirEntry.getOffset(), decodeTarget, ICO_HEADER_LENGTH_BYTES, ICO_ICONDIRENTRY_LENGTH_BYTES);
 
         // Copy the payload into the new buffer.
         final int singlePayloadOffset =  ICO_HEADER_LENGTH_BYTES + ICO_ICONDIRENTRY_LENGTH_BYTES;
-        System.arraycopy(mDecodand, mOffset + iconDirEntry.mPayloadOffset, decodeTarget, singlePayloadOffset, iconDirEntry.mPayloadSize);
+        System.arraycopy(decodand, offset + iconDirEntry.payloadOffset, decodeTarget, singlePayloadOffset, iconDirEntry.payloadSize);
 
         // Update the offset field of the ICONDIRENTRY to make the new ICO valid.
         decodeTarget[ICO_HEADER_LENGTH_BYTES + 12] = (byte) singlePayloadOffset;
         decodeTarget[ICO_HEADER_LENGTH_BYTES + 13] = (byte) (singlePayloadOffset >>> 8);
         decodeTarget[ICO_HEADER_LENGTH_BYTES + 14] = (byte) (singlePayloadOffset >>> 16);
         decodeTarget[ICO_HEADER_LENGTH_BYTES + 15] = (byte) (singlePayloadOffset >>> 24);
 
         // Decode the newly-constructed singleton-ICO.
@@ -306,22 +305,22 @@ public class ICODecoder implements Itera
     /**
      * Fetch an iterator over the images in this ICO, or null if this ICO seems to be invalid.
      *
      * @return An iterator over the Bitmaps stored in this ICO, or null if decoding fails.
      */
     @Override
     public ICOIterator iterator() {
         // If a previous call to decode concluded this ICO is invalid, abort.
-        if (mHasDecoded && !mIsValid) {
+        if (hasDecoded && !isValid) {
             return null;
         }
 
         // If we've not been decoded before, but now fail to make any sense of the ICO, abort.
-        if (!mHasDecoded) {
+        if (!hasDecoded) {
             if (!decodeIconDirectoryAndPossiblyPrune()) {
                 return null;
             }
         }
 
         // If decoding was a success, return an iterator over the images in this ICO.
         return new ICOIterator();
     }
@@ -334,45 +333,45 @@ public class ICODecoder implements Itera
         // The call to iterator returns null if decoding fails.
         Iterator<Bitmap> bitmaps = iterator();
         if (bitmaps == null) {
             return null;
         }
 
         LoadFaviconResult result = new LoadFaviconResult();
 
-        result.mBitmapsDecoded = bitmaps;
-        result.mFaviconBytes = mDecodand;
-        result.mOffset = mOffset;
-        result.mLength = mLen;
-        result.mIsICO = true;
+        result.bitmapsDecoded = bitmaps;
+        result.faviconBytes = decodand;
+        result.offset = offset;
+        result.length = len;
+        result.isICO = true;
 
         return result;
     }
 
     /**
      * Inner class to iterate over the elements in the ICO represented by the enclosing instance.
      */
     private class ICOIterator implements Iterator<Bitmap> {
         private int mIndex = 0;
 
         @Override
         public boolean hasNext() {
-            return mIndex < mIconDirectory.length;
+            return mIndex < iconDirectory.length;
         }
 
         @Override
         public Bitmap next() {
-            if (mIndex > mIconDirectory.length) {
+            if (mIndex > iconDirectory.length) {
                 throw new NoSuchElementException("No more elements in this ICO.");
             }
             return decodeBitmapAtIndex(mIndex++);
         }
 
         @Override
         public void remove() {
-            if (mIconDirectory[mIndex] == null) {
+            if (iconDirectory[mIndex] == null) {
                 throw new IllegalStateException("Remove already called for element " + mIndex);
             }
-            mIconDirectory[mIndex] = null;
+            iconDirectory[mIndex] = null;
         }
     }
 }

--- a/mobile/android/base/favicons/decoders/IconDirectoryEntry.java
+++ b/mobile/android/base/favicons/decoders/IconDirectoryEntry.java
@@ -4,48 +4,48 @@
 
 package org.mozilla.gecko.favicons.decoders;
 
 /**
  * Representation of an ICO file ICONDIRENTRY structure.
  */
 public class IconDirectoryEntry implements Comparable<IconDirectoryEntry> {
 
-    public static int sMaxBPP;
+    public static int maxBPP;
 
-    int mWidth;
-    int mHeight;
-    int mPaletteSize;
-    int mBitsPerPixel;
-    int mPayloadSize;
-    int mPayloadOffset;
-    boolean mPayloadIsPNG;
+    int width;
+    int height;
+    int paletteSize;
+    int bitsPerPixel;
+    int payloadSize;
+    int payloadOffset;
+    boolean payloadIsPNG;
 
     // Tracks the index in the Icon Directory of this entry. Useful only for pruning.
-    int mIndex;
-    boolean mIsErroneous;
+    int index;
+    boolean isErroneous;
 
     public IconDirectoryEntry(int width, int height, int paletteSize, int bitsPerPixel, int payloadSize, int payloadOffset, boolean payloadIsPNG) {
-        mWidth = width;
-        mHeight = height;
-        mPaletteSize = paletteSize;
-        mBitsPerPixel = bitsPerPixel;
-        mPayloadSize = payloadSize;
-        mPayloadOffset = payloadOffset;
-        mPayloadIsPNG = payloadIsPNG;
+        this.width = width;
+        this.height = height;
+        this.paletteSize = paletteSize;
+        this.bitsPerPixel = bitsPerPixel;
+        this.payloadSize = payloadSize;
+        this.payloadOffset = payloadOffset;
+        this.payloadIsPNG = payloadIsPNG;
     }
 
     /**
      * Method to get a dummy Icon Directory Entry with the Erroneous bit set.
      *
      * @return An erroneous placeholder Icon Directory Entry.
      */
     public static IconDirectoryEntry getErroneousEntry() {
         IconDirectoryEntry ret = new IconDirectoryEntry(-1, -1, -1, -1, -1, -1, false);
-        ret.mIsErroneous = true;
+        ret.isErroneous = true;
 
         return ret;
     }
 
     /**
      * Create an IconDirectoryEntry object from a byte[]. Interprets the buffer starting at the given
      * offset as an IconDirectoryEntry and returns the result.
      *
@@ -113,89 +113,89 @@ public class IconDirectoryEntry implemen
 
         return new IconDirectoryEntry(imageWidth, imageHeight, paletteSize, bitsPerPixel, entryLength, payloadOffset, payloadIsPNG);
     }
 
     /**
      * Get the number of bytes from the start of the ICO file to the beginning of this entry.
      */
     public int getOffset() {
-        return ICODecoder.ICO_HEADER_LENGTH_BYTES + (mIndex * ICODecoder.ICO_ICONDIRENTRY_LENGTH_BYTES);
+        return ICODecoder.ICO_HEADER_LENGTH_BYTES + (index * ICODecoder.ICO_ICONDIRENTRY_LENGTH_BYTES);
     }
 
     @Override
     public int compareTo(IconDirectoryEntry another) {
-        if (mWidth > another.mWidth) {
+        if (width > another.width) {
             return 1;
         }
 
-        if (mWidth < another.mWidth) {
+        if (width < another.width) {
             return -1;
         }
 
         // Where both images exceed the max BPP, take the smaller of the two BPP values.
-        if (mBitsPerPixel >= sMaxBPP && another.mBitsPerPixel >= sMaxBPP) {
-            if (mBitsPerPixel < another.mBitsPerPixel) {
+        if (bitsPerPixel >= maxBPP && another.bitsPerPixel >= maxBPP) {
+            if (bitsPerPixel < another.bitsPerPixel) {
                 return 1;
             }
 
-            if (mBitsPerPixel > another.mBitsPerPixel) {
+            if (bitsPerPixel > another.bitsPerPixel) {
                 return -1;
             }
         }
 
         // Otherwise, take the larger of the BPP values.
-        if (mBitsPerPixel > another.mBitsPerPixel) {
+        if (bitsPerPixel > another.bitsPerPixel) {
             return 1;
         }
 
-        if (mBitsPerPixel < another.mBitsPerPixel) {
+        if (bitsPerPixel < another.bitsPerPixel) {
             return -1;
         }
 
         // Prefer large palettes.
-        if (mPaletteSize > another.mPaletteSize) {
+        if (paletteSize > another.paletteSize) {
             return 1;
         }
 
-        if (mPaletteSize < another.mPaletteSize) {
+        if (paletteSize < another.paletteSize) {
             return -1;
         }
 
         // Prefer smaller payloads.
-        if (mPayloadSize < another.mPayloadSize) {
+        if (payloadSize < another.payloadSize) {
             return 1;
         }
 
-        if (mPayloadSize > another.mPayloadSize) {
+        if (payloadSize > another.payloadSize) {
             return -1;
         }
 
         // If all else fails, prefer PNGs over BMPs. They tend to be smaller.
-        if (mPayloadIsPNG && !another.mPayloadIsPNG) {
+        if (payloadIsPNG && !another.payloadIsPNG) {
             return 1;
         }
 
-        if (!mPayloadIsPNG && another.mPayloadIsPNG) {
+        if (!payloadIsPNG && another.payloadIsPNG) {
             return -1;
         }
 
         return 0;
     }
 
     public static void setMaxBPP(int maxBPP) {
-        sMaxBPP = maxBPP;
+        IconDirectoryEntry.maxBPP = maxBPP;
     }
 
     @Override
     public String toString() {
         return "IconDirectoryEntry{" +
-                "\nmWidth=" + mWidth +
-                ", \nmHeight=" + mHeight +
-                ", \nmPaletteSize=" + mPaletteSize +
-                ", \nmBitsPerPixel=" + mBitsPerPixel +
-                ", \nmPayloadSize=" + mPayloadSize +
-                ", \nmPayloadOffset=" + mPayloadOffset +
-                ", \nmPayloadIsPNG=" + mPayloadIsPNG +
-                ", \nmIndex=" + mIndex +
+                "\nwidth=" + width +
+                ", \nheight=" + height +
+                ", \npaletteSize=" + paletteSize +
+                ", \nbitsPerPixel=" + bitsPerPixel +
+                ", \npayloadSize=" + payloadSize +
+                ", \npayloadOffset=" + payloadOffset +
+                ", \npayloadIsPNG=" + payloadIsPNG +
+                ", \nindex=" + index +
                 '}';
     }
 }