Bug 12084095 Remove 'Firefox Marketplace' from the list of default bookmarks.r=mcomella

mobile/android/base/db/LocalBrowserDB.java

@@ -228,9 +228,8 @@ public class LocalBrowserDB implements BrowserDB {
                 if (RestrictedProfiles.isRestrictedProfile(context)) {
                     // matching on variable name from strings.xml.in
                     final String addons = "bookmarkdefaults_title_addons";
-                    final String marketplace = "bookmarkdefaults_title_marketplace";
                     final String regularSumo = "bookmarkdefaults_title_support";
-                    if (name.equals(addons) || name.equals(marketplace) || name.equals(regularSumo)) {
+                    if (name.equals(addons) || name.equals(regularSumo)) {
                         continue;
                     }
                 }

mobile/android/base/locales/en-US/android_strings.dtd

@@ -748,8 +748,6 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY bookmarks_addons "Firefox: Customize with add-ons">
 <!-- LOCALIZATION NOTE (bookmarks_support): link title for https://support.mozilla.org/ -->
 <!ENTITY bookmarks_support "Firefox: Support">
-<!--LOCALIZATION NOTE (bookmarks_marketplace):link title for https://marketplace.firefox.com -->
-<!ENTITY bookmarks_marketplace "Firefox Marketplace">
 <!-- LOCALIZATION NOTE (bookmarks_restricted_support): link title for https://support.mozilla.org/kb/controlledaccess -->
 <!ENTITY bookmarks_restricted_support2 "Firefox Help and Support for restricted profiles on Android tablets">
 <!-- LOCALIZATION NOTE (bookmarks_restricted_webmaker):link title for https://webmaker.org -->

mobile/android/base/strings.xml.in

@@ -482,10 +482,6 @@
   <string name="bookmarkdefaults_title_support">&bookmarks_support;</string>
   <string name="bookmarkdefaults_url_support">https://support.mozilla.org/products/mobile</string>
 
-  <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_marketplace -->
-  <string name="bookmarkdefaults_title_marketplace">&bookmarks_marketplace;</string>
-  <string name="bookmarkdefaults_url_marketplace">https://marketplace.firefox.com/</string>
-
   <string name="bookmarkdefaults_title_restricted_webmaker">&bookmarks_restricted_webmaker;</string>
   <string name="bookmarkdefaults_url_restricted_webmaker">https://webmaker.org/</string>
 

mobile/android/base/util/UnusedResourcesUtil.java

@@ -60,7 +60,6 @@ final class UnusedResourcesUtil {
 
     public static final int[] USED_IN_BOOKMARKDEFAULTS = {
             R.raw.bookmarkdefaults_favicon_addons,
-            R.raw.bookmarkdefaults_favicon_marketplace,
             R.raw.bookmarkdefaults_favicon_support,
             R.raw.bookmarkdefaults_favicon_restricted_support,
             R.raw.bookmarkdefaults_favicon_restricted_webmaker,