From e459979715b9fb4ec503dbd57de5b834d5975ec1 Mon Sep 17 00:00:00 2001
From: Christian Ascheberg <c.ascheberg@gmx.de>
Date: Tue, 8 Apr 2014 23:16:42 +0300
Subject: [PATCH] Bug 971743 - Do not clear the download history with the
 browsing history. r=wesj

---
 .../android/base/locales/en-US/android_strings.dtd |  4 ++--
 mobile/android/base/resources/values/arrays.xml    |  6 +++---
 mobile/android/base/strings.xml.in                 |  4 ++--
 mobile/android/chrome/content/browser.js           | 10 ----------
 mobile/android/modules/Sanitizer.jsm               | 14 --------------
 5 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 1cc26f763d9..27ce56f01e5 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -156,14 +156,14 @@ size. -->
 <!ENTITY pref_sync "Sync">
 <!ENTITY pref_search_suggestions "Show search suggestions">
 <!ENTITY pref_import_android "Import from Android">
-<!ENTITY pref_private_data_history "Browsing &amp; download history">
+<!ENTITY pref_private_data_history2 "Browsing history">
 <!ENTITY pref_private_data_formdata "Form &amp; search history">
 <!ENTITY pref_private_data_cookies2 "Cookies &amp; active logins">
 <!ENTITY pref_private_data_passwords "Saved passwords">
 <!ENTITY pref_private_data_cache "Cache">
 <!ENTITY pref_private_data_offlineApps "Offline website data">
 <!ENTITY pref_private_data_siteSettings2 "Site settings">
-<!ENTITY pref_private_data_downloadFiles "Downloaded files">
+<!ENTITY pref_private_data_downloadFiles2 "Downloads">
 
 
 <!ENTITY pref_about_firefox "About &brandShortName;">
diff --git a/mobile/android/base/resources/values/arrays.xml b/mobile/android/base/resources/values/arrays.xml
index c5a4f8bf36b..9d5a029379f 100644
--- a/mobile/android/base/resources/values/arrays.xml
+++ b/mobile/android/base/resources/values/arrays.xml
@@ -78,8 +78,8 @@
         <item>android_import.data.history</item>
     </string-array>
     <string-array name="pref_private_data_entries">
-        <item>@string/pref_private_data_history</item>
-        <item>@string/pref_private_data_downloadFiles</item>
+        <item>@string/pref_private_data_history2</item>
+        <item>@string/pref_private_data_downloadFiles2</item>
         <item>@string/pref_private_data_formdata</item>
         <item>@string/pref_private_data_cookies2</item>
         <item>@string/pref_private_data_passwords</item>
@@ -98,7 +98,7 @@
         <item>true</item>
     </string-array>
     <string-array name="pref_private_data_keys">
-        <item>private.data.history_downloads</item>
+        <item>private.data.history</item>
         <item>private.data.downloadFiles</item>
         <item>private.data.formdata</item>
         <item>private.data.cookies_sessions</item>
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index e77f5831170..139817298aa 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -167,14 +167,14 @@
   <string name="pref_show_product_announcements">&pref_show_product_announcements;</string>
   <string name="pref_sync">&pref_sync;</string>
   <string name="pref_search_suggestions">&pref_search_suggestions;</string>
-  <string name="pref_private_data_history">&pref_private_data_history;</string>
+  <string name="pref_private_data_history2">&pref_private_data_history2;</string>
   <string name="pref_private_data_formdata">&pref_private_data_formdata;</string>
   <string name="pref_private_data_cookies2">&pref_private_data_cookies2;</string>
   <string name="pref_private_data_passwords">&pref_private_data_passwords;</string>
   <string name="pref_private_data_cache">&pref_private_data_cache;</string>
   <string name="pref_private_data_offlineApps">&pref_private_data_offlineApps;</string>
   <string name="pref_private_data_siteSettings">&pref_private_data_siteSettings2;</string>
-  <string name="pref_private_data_downloadFiles">&pref_private_data_downloadFiles;</string>
+  <string name="pref_private_data_downloadFiles2">&pref_private_data_downloadFiles2;</string>
   <string name="pref_import_android">&pref_import_android;</string>
   <string name="pref_update_autodownload">&pref_update_autodownload2;</string>
   <string name="pref_update_autodownload_wifi">&pref_update_autodownload_wifi;</string>
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 14fc65b58f9..6a749f467fe 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -1306,16 +1306,6 @@ var BrowserApp = {
 
       try {
         switch (key) {
-          case "history_downloads":
-            Sanitizer.clearItem("history");
-
-            // If we're also removing downloaded files, don't clear the
-            // download history yet since it will be handled when the files are
-            // removed.
-            if (!json["downloadFiles"]) {
-              Sanitizer.clearItem("downloads");
-            }
-            break;
           case "cookies_sessions":
             Sanitizer.clearItem("cookies");
             Sanitizer.clearItem("sessions");
diff --git a/mobile/android/modules/Sanitizer.jsm b/mobile/android/modules/Sanitizer.jsm
index dbbdf80676d..a30c28fcf94 100644
--- a/mobile/android/modules/Sanitizer.jsm
+++ b/mobile/android/modules/Sanitizer.jsm
@@ -177,20 +177,6 @@ Sanitizer.prototype = {
       }
     },
 
-    downloads: {
-      clear: function ()
-      {
-        downloads.iterate(function (dl) {
-          dl.remove();
-        });
-      },
-
-      get canClear()
-      {
-        return downloads.canClear;
-      }
-    },
-
     downloadFiles: {
       clear: function ()
       {