Bug 699793 - Clear favicon urls database when history is cleared (r=blassey)

mobile/android/base/ConfirmPreference.java

@@ -66,6 +66,7 @@ class ConfirmPreference extends DialogPreference {
             GeckoAppShell.getHandler().post(new Runnable(){
                 public void run() {
                     BrowserDB.clearHistory(mContext.getContentResolver());
+                    GeckoApp.mAppContext.mFavicons.clearFavicons();
                 }
             });
         } else if ("clear_private_data".equalsIgnoreCase(mAction)) {

mobile/android/base/Favicons.java

@@ -152,6 +152,12 @@ public class Favicons {
 
             db.replace(TABLE_NAME, null, values);
         }
+
+
+        public void clearFavicons() {
+            SQLiteDatabase db = mDbHelper.getWritableDatabase();
+            db.delete(TABLE_NAME, null, null);
+        }
     }
 
     public Favicons(Context context) {
@@ -199,6 +205,10 @@ public class Favicons {
         return task.cancel(false);
     }
 
+    public void clearFavicons() {
+        mDbHelper.clearFavicons();
+    }
+
     public void close() {
         Log.d(LOGTAG, "Closing Favicons database");
         mDbHelper.close();