Backout 042b44652822 (bug 715258) for breaking robocop & others on a CLOSED TREE
authorEd Morley <emorley@mozilla.com>
Fri, 14 Dec 2012 09:26:00 +0000
changeset 125147 b1fb4089fa9bce285d6cdbc3c57272cabcada21e
parent 125146 6002b73474a7085819aa342277c86249d524b893
child 125148 11fd34243cbd30bf101cfe3f9b37e58862fb1e98
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs715258
milestone20.0a1
backs out042b4465282212b74a9502a8cff6faa53a71d0ff
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout 042b44652822 (bug 715258) for breaking robocop & others on a CLOSED TREE
mobile/android/base/Makefile.in
mobile/android/base/db/BrowserProvider.java.in
mobile/android/base/strings.xml.in
mobile/android/branding/aurora/android-resources.mn
mobile/android/branding/aurora/content/bookmarkdefaults_favicon_aboutfirefox.png
mobile/android/branding/aurora/content/favicon32.png
mobile/android/branding/aurora/content/favicon64.png
mobile/android/branding/aurora/content/jar.mn
mobile/android/branding/beta/android-resources.mn
mobile/android/branding/beta/content/bookmarkdefaults_favicon_aboutfirefox.png
mobile/android/branding/beta/content/favicon64.png
mobile/android/branding/beta/content/jar.mn
mobile/android/branding/nightly/android-resources.mn
mobile/android/branding/nightly/content/bookmarkdefaults_favicon_aboutfirefox.png
mobile/android/branding/nightly/content/favicon64.png
mobile/android/branding/nightly/content/jar.mn
mobile/android/branding/official/android-resources.mn
mobile/android/branding/official/content/bookmarkdefaults_favicon_aboutfirefox.png
mobile/android/branding/official/content/favicon64.png
mobile/android/branding/official/content/jar.mn
mobile/android/branding/unofficial/android-resources.mn
mobile/android/branding/unofficial/content/bookmarkdefaults_favicon_aboutfirefox.png
mobile/android/branding/unofficial/content/favicon64.png
mobile/android/branding/unofficial/content/fennec_72x72.png
mobile/android/branding/unofficial/content/jar.mn
mobile/android/chrome/content/about.xhtml
mobile/android/chrome/content/aboutAddons.xhtml
mobile/android/chrome/content/aboutApps.xhtml
mobile/android/chrome/content/aboutCertError.xhtml
mobile/android/chrome/content/aboutDownloads.xhtml
mobile/android/chrome/content/aboutFeedback.xhtml
mobile/android/chrome/content/aboutHome.xhtml
mobile/android/chrome/content/blockedSite.xhtml
mobile/android/chrome/content/netError.xhtml
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -568,16 +568,18 @@ RES_DRAWABLE_BASE = \
   res/drawable/site_security_identified.png \
   res/drawable/site_security_verified.png \
   res/drawable/urlbar_stop.png \
   res/drawable/reader.png \
   res/drawable/reading_list.png \
   res/drawable/validation_arrow.png \
   res/drawable/validation_arrow_inverted.png \
   res/drawable/validation_bg.9.png \
+  res/drawable/bookmarkdefaults_favicon_support.png \
+  res/drawable/bookmarkdefaults_favicon_addons.png \
   res/drawable/handle_end.png \
   res/drawable/handle_middle.png \
   res/drawable/handle_start.png \
   $(addprefix res/drawable-mdpi/,$(notdir $(SYNC_RES_DRAWABLE_MDPI))) \
   $(NULL)
 
 RES_DRAWABLE_LDPI = \
   $(addprefix res/drawable-ldpi/,$(notdir $(SYNC_RES_DRAWABLE_LDPI))) \
--- a/mobile/android/base/db/BrowserProvider.java.in
+++ b/mobile/android/base/db/BrowserProvider.java.in
@@ -36,17 +36,16 @@ import org.mozilla.gecko.db.BrowserContr
 import org.mozilla.gecko.db.BrowserContract.Thumbnails;
 import org.mozilla.gecko.db.BrowserContract.URLColumns;
 import org.mozilla.gecko.db.BrowserContract;
 import org.mozilla.gecko.db.BrowserDB;
 import org.mozilla.gecko.db.DBUtils;
 import org.mozilla.gecko.ProfileMigrator;
 import org.mozilla.gecko.sync.Utils;
 import org.mozilla.gecko.util.GeckoBackgroundThread;
-import org.mozilla.gecko.util.GeckoJarReader;
 
 import android.app.SearchManager;
 import android.content.ContentProvider;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.ContentProviderResult;
 import android.content.ContentProviderOperation;
 import android.content.OperationApplicationException;
@@ -56,17 +55,16 @@ import android.database.Cursor;
 import android.database.DatabaseUtils;
 import android.database.MatrixCursor;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.graphics.BitmapFactory;
 import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 
 public class BrowserProvider extends ContentProvider {
     private static final String LOGTAG = "GeckoBrowserProvider";
     private Context mContext;
@@ -1015,84 +1013,43 @@ public class BrowserProvider extends Con
                     Log.e(LOGTAG, "Can't create bookmark " + name, ex);
                 } catch (java.lang.NoSuchFieldException ex) {
                     Log.e(LOGTAG, "Can't create bookmark " + name, ex);
                 }
             }
         }
 
         private void setDefaultFavicon(SQLiteDatabase db, String name, String url) {
-            ByteArrayOutputStream stream = getDefaultFaviconFromPath(db, name, url);
-            if (stream == null) {
-              stream = getDefaultFaviconFromDrawable(db, name, url);
+            Class<?> drawablesClass = R.drawable.class;
+            ByteArrayOutputStream stream = null;
+            try {
+                // Look for a drawable with the id R.drawable.bookmarkdefaults_favicon_*
+                Field faviconField = drawablesClass.getField(name.replace("_title_", "_favicon_"));
+                if (faviconField == null)
+                  return;
+
+                int faviconId = faviconField.getInt(null);
+                Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), faviconId);
+                stream = new ByteArrayOutputStream();
+                bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
+            } catch (java.lang.IllegalAccessException ex) {
+                Log.e(LOGTAG, "Can't create favicon " + name, ex);
+            } catch (java.lang.NoSuchFieldException ex) {
+                // if there is no such field, create the bookmark without a favicon
+                Log.d(LOGTAG, "Can't create favicon " + name);
             }
+
             if (stream != null) {
                 ContentValues values = new ContentValues();
                 values.put(Favicons.DATA, stream.toByteArray());
                 values.put(Favicons.PAGE_URL, url);
                 insertFavicon(db, values);
             }
         }
 
-        private ByteArrayOutputStream getDefaultFaviconFromPath(SQLiteDatabase db, String name, String url) {
-            ByteArrayOutputStream stream = null;
-            Class stringClass = R.string.class;
-            try {
-                // Look for a drawable with the id R.drawable.bookmarkdefaults_favicon_*
-                Field faviconField = stringClass.getField(name.replace("_title_", "_favicon_"));
-                if (faviconField == null)
-                  return null;
-                int faviconId = faviconField.getInt(null);
-                String path = mContext.getString(faviconId);
-
-                String apkPath = mContext.getPackageResourcePath();
-                File apkFile = new File(apkPath);
-                BitmapDrawable bitmapDrawable = GeckoJarReader.getBitmapDrawable(mContext.getResources(),
-                                                                                 "jar:jar:" + apkFile.toURI() + "!/omni.ja!/" + path);
-                if (bitmapDrawable == null) {
-                  return null;
-                }
-                Bitmap bitmap = bitmapDrawable.getBitmap();
-                if (bitmap == null) {
-                  return null;
-                }
-                stream = new ByteArrayOutputStream();
-                bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
-            } catch (java.lang.IllegalAccessException ex) {
-                Log.e(LOGTAG, "[Path] Can't create favicon " + name, ex);
-            } catch (java.lang.NoSuchFieldException ex) {
-                // if there is no such field, create the bookmark without a favicon
-                Log.d(LOGTAG, "[Path] Can't create favicon " + name);
-            }
-            return stream;
-        }
-
-        private ByteArrayOutputStream getDefaultFaviconFromDrawable(SQLiteDatabase db, String name, String url) {
-            Class<?> drawablesClass = R.drawable.class;
-            ByteArrayOutputStream stream = null;
-            try {
-                // Look for a drawable with the id R.drawable.bookmarkdefaults_favicon_*
-                Field faviconField = drawablesClass.getField(name.replace("_title_", "_favicon_"));
-                if (faviconField == null)
-                  return null;
-
-                int faviconId = faviconField.getInt(null);
-                Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), faviconId);
-                stream = new ByteArrayOutputStream();
-                bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
-            } catch (java.lang.IllegalAccessException ex) {
-                Log.e(LOGTAG, "[Drawable] Can't create favicon " + name, ex);
-            } catch (java.lang.NoSuchFieldException ex) {
-                // if there is no such field, create the bookmark without a favicon
-                Log.d(LOGTAG, "[Drawable] Can't create favicon " + name);
-            }
-
-            return stream;
-        }
-
         private void createOrUpdateAllSpecialFolders(SQLiteDatabase db) {
             createOrUpdateSpecialFolder(db, Bookmarks.MOBILE_FOLDER_GUID,
                 R.string.bookmarks_folder_mobile, 0);
             createOrUpdateSpecialFolder(db, Bookmarks.TOOLBAR_FOLDER_GUID,
                 R.string.bookmarks_folder_toolbar, 1);
             createOrUpdateSpecialFolder(db, Bookmarks.MENU_FOLDER_GUID,
                 R.string.bookmarks_folder_menu, 2);
             createOrUpdateSpecialFolder(db, Bookmarks.TAGS_FOLDER_GUID,
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -204,24 +204,22 @@
   <string name="filepicker_audio_title">&filepicker_audio_title;</string>
   <string name="filepicker_image_title">&filepicker_image_title;</string>
   <string name="filepicker_video_title">&filepicker_video_title;</string>
 
   <!-- Default bookmarks. Use bookmarks titles shared with XUL from mobile's
        profile/bookmarks.inc. Don't expose the URLs to L10N. -->
   <string name="bookmarkdefaults_title_aboutfirefox">@bookmarks_aboutBrowser@</string>
   <string name="bookmarkdefaults_url_aboutfirefox">about:firefox</string>
-  <string name="bookmarkdefaults_favicon_aboutfirefox">chrome/chrome/content/branding/favicon64.png</string>
 
   <string name="bookmarkdefaults_title_addons">@bookmarks_addons@</string>
   <string name="bookmarkdefaults_url_addons">https://addons.mozilla.org/@AB_CD@/android/</string>
 
   <string name="bookmarkdefaults_title_support">@bookmarks_support@</string>
   <string name="bookmarkdefaults_url_support">http://support.mozilla.org/@AB_CD@/mobile</string>
-  <string name="bookmarkdefaults_favicon_abouthome">chrome/chrome/content/branding/favicon64.png</string>
 
   <string name="bookmarkdefaults_title_abouthome">@bookmarks_aboutHome@</string>
   <string name="bookmarkdefaults_url_abouthome">about:home</string>
 
   <!-- Site identity popup -->
   <string name="identity_connected_to">&identity_connected_to;</string>
   <string name="identity_run_by">&identity_run_by;</string>
 
--- a/mobile/android/branding/aurora/android-resources.mn
+++ b/mobile/android/branding/aurora/android-resources.mn
@@ -1,3 +1,4 @@
 mobile/android/branding/aurora/content/logo.png
 mobile/android/branding/aurora/content/favicon32.png
+mobile/android/branding/aurora/content/bookmarkdefaults_favicon_aboutfirefox.png
 mobile/android/branding/aurora/content/mdpi/widget_icon.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f515b5d337e2f8fccc52bec5700778c5ace418b1
GIT binary patch
literal 3712
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
index 40421cc7948a8179b589a5538a96d0c0f5267946..f515b5d337e2f8fccc52bec5700778c5ace418b1
GIT binary patch
literal 3712
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
deleted file mode 100644
index bb949ccbade829caf3df2f42c5508591c644296d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mobile/android/branding/aurora/content/jar.mn
+++ b/mobile/android/branding/aurora/content/jar.mn
@@ -3,9 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 chrome.jar:
 % content branding %content/branding/
   content/branding/about.png                     (about.png)
   content/branding/logoWordmark.png              (logoWordmark.png)
   content/branding/logo.png                      (logo.png)
   content/branding/favicon32.png                 (favicon32.png)
-  content/branding/favicon64.png                 (favicon64.png)
--- a/mobile/android/branding/beta/android-resources.mn
+++ b/mobile/android/branding/beta/android-resources.mn
@@ -1,3 +1,4 @@
 mobile/android/branding/beta/content/logo.png
 mobile/android/branding/beta/content/favicon32.png
+mobile/android/branding/beta/content/bookmarkdefaults_favicon_aboutfirefox.png
 mobile/android/branding/beta/content/mdpi/widget_icon.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ac4a6968bf2746ad89a82d85df3a8679b5530cca
GIT binary patch
literal 2670
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
deleted file mode 100644
index 20bae0717c7ba086955fb4578d84cfe82fc77f47..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mobile/android/branding/beta/content/jar.mn
+++ b/mobile/android/branding/beta/content/jar.mn
@@ -3,9 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 chrome.jar:
 % content branding %content/branding/
   content/branding/about.png                     (about.png)
   content/branding/logoWordmark.png              (logoWordmark.png)
   content/branding/logo.png                      (logo.png)
   content/branding/favicon32.png                 (favicon32.png)
-  content/branding/favicon64.png                 (favicon64.png)
--- a/mobile/android/branding/nightly/android-resources.mn
+++ b/mobile/android/branding/nightly/android-resources.mn
@@ -1,3 +1,4 @@
 mobile/android/branding/nightly/content/logo.png
 mobile/android/branding/nightly/content/favicon32.png
+mobile/android/branding/nightly/content/bookmarkdefaults_favicon_aboutfirefox.png
 mobile/android/branding/nightly/content/mdpi/widget_icon.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..43ad466c6152fe70cb872cac784929be8d7d9d84
GIT binary patch
literal 3485
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
deleted file mode 100644
index 1ac6eaf5197821b3336ff59a37c50a7cef300f8a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mobile/android/branding/nightly/content/jar.mn
+++ b/mobile/android/branding/nightly/content/jar.mn
@@ -3,9 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 chrome.jar:
 % content branding %content/branding/
   content/branding/about.png                     (about.png)
   content/branding/logoWordmark.png              (logoWordmark.png)
   content/branding/logo.png                      (logo.png)
   content/branding/favicon32.png                 (favicon32.png)
-  content/branding/favicon64.png                 (favicon64.png)
--- a/mobile/android/branding/official/android-resources.mn
+++ b/mobile/android/branding/official/android-resources.mn
@@ -1,3 +1,4 @@
 mobile/android/branding/official/content/logo.png
 mobile/android/branding/official/content/favicon32.png
+mobile/android/branding/official/content/bookmarkdefaults_favicon_aboutfirefox.png
 mobile/android/branding/official/content/mdpi/widget_icon.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ac4a6968bf2746ad89a82d85df3a8679b5530cca
GIT binary patch
literal 2670
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
deleted file mode 100644
index 20bae0717c7ba086955fb4578d84cfe82fc77f47..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mobile/android/branding/official/content/jar.mn
+++ b/mobile/android/branding/official/content/jar.mn
@@ -3,9 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 chrome.jar:
 % content branding %content/branding/
   content/branding/about.png                     (about.png)
   content/branding/logoWordmark.png              (logoWordmark.png)
   content/branding/logo.png                      (logo.png)
   content/branding/favicon32.png                 (favicon32.png)
-  content/branding/favicon64.png                 (favicon64.png)
--- a/mobile/android/branding/unofficial/android-resources.mn
+++ b/mobile/android/branding/unofficial/android-resources.mn
@@ -1,3 +1,4 @@
 mobile/android/branding/unofficial/content/favicon32.png
 mobile/android/branding/unofficial/content/logo.png
+mobile/android/branding/unofficial/content/bookmarkdefaults_favicon_aboutfirefox.png
 mobile/android/branding/unofficial/content/mdpi/widget_icon.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3f04acd50d303235149c6a2822003ed94f8a51a7
GIT binary patch
literal 1761
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
Di}Ylk
deleted file mode 100644
index d6263c9d240366a40a4c838108b105fdd474ce13..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
index 1cdb4df2fcb711d28aa1ea982da26a8d4455d0df..c7874013f6af9174fda8b201f513ea0baaba9e00
GIT binary patch
literal 7223
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
FV1ld%%{c%7
--- a/mobile/android/branding/unofficial/content/jar.mn
+++ b/mobile/android/branding/unofficial/content/jar.mn
@@ -3,9 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 chrome.jar:
 % content branding %content/branding/
   content/branding/about.png                     (about.png)
   content/branding/logoWordmark.png              (logoWordmark.png)
   content/branding/logo.png                      (logo.png)
   content/branding/favicon32.png                 (favicon32.png)
-  content/branding/favicon64.png                 (favicon64.png)
--- a/mobile/android/chrome/content/about.xhtml
+++ b/mobile/android/chrome/content/about.xhtml
@@ -13,17 +13,17 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta name="viewport" content="width=480; initial-scale=.6667; user-scalable=no"/>
   <title>&aboutPage.title;</title>
   <link rel="stylesheet" href="chrome://browser/skin/aboutPage.css" type="text/css"/>
-  <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
+  <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
 </head>
 
 <body dir="&locale.dir;">
   <div id="header">
     <div id="wordmark"></div>
 #expand <p id="version">__MOZ_APP_VERSION__</p>
   </div>
 
--- a/mobile/android/chrome/content/aboutAddons.xhtml
+++ b/mobile/android/chrome/content/aboutAddons.xhtml
@@ -13,17 +13,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <title>&aboutAddons.title2;</title>
   <meta name="viewport" content="width=480; initial-scale=.6667; user-scalable=0" />
-  <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
+  <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
   <link rel="stylesheet" href="chrome://browser/skin/aboutAddons.css" type="text/css"/>
   <style>
     .hide-on-enable,
     .show-on-error,
     .show-on-uninstall,
     .show-on-install,
     .show-on-restart,
     div[isDisabled="true"] .hide-on-disable {
--- a/mobile/android/chrome/content/aboutApps.xhtml
+++ b/mobile/android/chrome/content/aboutApps.xhtml
@@ -16,17 +16,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>&aboutApps.title2;</title>
     <meta name="viewport" content="width=480; initial-scale=.6667; user-scalable=0" />
-    <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
+    <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
     <link rel="stylesheet" type="text/css" href="chrome://browser/skin/aboutApps.css" media="all" />
     <script type="text/javascript;version=1.8" src="chrome://browser/content/aboutApps.js"></script>
   </head>
 
   <body dir="&locale.dir;" onload="onLoad(event)" onunload="onUnload(event)">
     <div class="header">
       <div>&aboutApps.header;</div>
       <img src="chrome://browser/skin/images/addons-amo-hdpi.png" class="icon" pref="app.marketplaceURL" onclick="openLink(this);"/>
--- a/mobile/android/chrome/content/aboutCertError.xhtml
+++ b/mobile/android/chrome/content/aboutCertError.xhtml
@@ -22,17 +22,17 @@
     <meta name="viewport" content="width=device-width; user-scalable=false" />
     <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
     <!-- This page currently uses the same favicon as neterror.xhtml.
          If the location of the favicon is changed for both pages, the
          FAVICON_ERRORPAGE_URL symbol in toolkit/components/places/src/nsFaviconService.h
          should be updated. If this page starts using a different favicon
          than neterrorm nsFaviconService->SetAndLoadFaviconForPage
          should be updated to ignore this one as well. -->
-    <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://global/skin/icons/warning-64.png"/>
+    <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/warning-16.png"/>
 
     <script type="application/javascript"><![CDATA[
       // Error url MUST be formatted like this:
       //   about:certerror?e=error&u=url&d=desc
 
       // Note that this file uses document.documentURI to get
       // the URL (with the format from above). This is because
       // document.location.href gets the current URI off the docshell,
--- a/mobile/android/chrome/content/aboutDownloads.xhtml
+++ b/mobile/android/chrome/content/aboutDownloads.xhtml
@@ -14,17 +14,17 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 <head>
   <title>&aboutDownloads.title;</title>
   <meta name="viewport" content="width=480; initial-scale=.6667; user-scalable=0" />
-  <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
+  <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
   <link rel="stylesheet" href="chrome://browser/skin/aboutDownloads.css" type="text/css"/>
 </head>
 
 <body dir="&locale.dir;" onload="Downloads.init();" onunload="Downloads.uninit();">
   <div class="header">
     <div>&aboutDownloads.header;</div>
   </div>
   <ul id="downloads-list"></ul>
--- a/mobile/android/chrome/content/aboutFeedback.xhtml
+++ b/mobile/android/chrome/content/aboutFeedback.xhtml
@@ -14,17 +14,17 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <title>&pageTitle;</title>
   <meta name="viewport" content="width=device-width; user-scalable=0" />
   <link rel="stylesheet" href="chrome://browser/skin/aboutFeedback.css" type="text/css"/>
-  <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
+  <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
 </head>
 
 <body dir="&locale.dir;" onload="init();" onunload="uninit();">
 
   <section id="intro" active="true">
     <h1 class="header">&intro.header;</h1>
     <div class="message">&intro.message;</div>
     <div class="link-box" onclick="switchSection('happy');">
--- a/mobile/android/chrome/content/aboutHome.xhtml
+++ b/mobile/android/chrome/content/aboutHome.xhtml
@@ -4,13 +4,13 @@
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
+  <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
 </head>
 <body>
 </body>
 </html>
--- a/mobile/android/chrome/content/blockedSite.xhtml
+++ b/mobile/android/chrome/content/blockedSite.xhtml
@@ -14,17 +14,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml" class="blacklist">
   <head>
     <meta name="viewport" content="width=device-width; user-scalable=false" />
     <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
-    <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://global/skin/icons/blacklist_large.png"/>
+    <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/blacklist_favicon.png"/>
 
     <script type="application/javascript"><![CDATA[
       // Error url MUST be formatted like this:
       //   about:blocked?e=error_code&u=url
       
       // Note that this file uses document.documentURI to get
       // the URL (with the format from above). This is because
       // document.location.href gets the current URI off the docshell,
--- a/mobile/android/chrome/content/netError.xhtml
+++ b/mobile/android/chrome/content/netError.xhtml
@@ -19,17 +19,17 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta name="viewport" content="width=device-width; user-scalable=false;" /> 
     <title>&loadError.label;</title>
     <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
     <!-- If the location of the favicon is changed here, the FAVICON_ERRORPAGE_URL symbol in
          toolkit/components/places/src/nsFaviconService.h should be updated. -->
-    <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://global/skin/icons/warning-64.png"/>
+    <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/warning-16.png"/>
 
     <script type="application/javascript"><![CDATA[
       // Error url MUST be formatted like this:
       //   moz-neterror:page?e=error&u=url&d=desc
       //
       // or optionally, to specify an alternate CSS class to allow for
       // custom styling and favicon:
       //