Backed out 15 changesets (bug 1612824, bug 1661234, bug 1619926, bug 1612380, bug 1559530, bug 1642990) for Xpc failures. CLOSED TREE

Backed out changeset 426d017d7e46 (bug 1642990)
Backed out changeset 84ab4021d403 (bug 1559530)
Backed out changeset 82a8305543e5 (bug 1559530)
Backed out changeset 38832c1185b8 (bug 1559530)
Backed out changeset f16918c10a6b (bug 1661234)
Backed out changeset 3a13258fbd51 (bug 1661234)
Backed out changeset abf8d8b24845 (bug 1612824)
Backed out changeset 7dfeb065a385 (bug 1619926)
Backed out changeset bc9d3e210fe7 (bug 1619926)
Backed out changeset 786164c461ae (bug 1619926)
Backed out changeset d89793e9d17d (bug 1619926)
Backed out changeset d665885bc912 (bug 1619926)
Backed out changeset 9260b6620943 (bug 1619926)
Backed out changeset af69a4896f2f (bug 1619926)
Backed out changeset b9cd6b7047b9 (bug 1612380)

Author: Butkovits Atila

browser/app/profile/firefox.js

@@ -421,6 +421,10 @@ pref("browser.helperApps.showOpenOptionForViewableInternally", true);
 // search engines URL
 pref("browser.search.searchEnginesURL",      "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
 
+// Market-specific search defaults
+pref("browser.search.geoSpecificDefaults", true);
+pref("browser.search.geoSpecificDefaults.url", "https://search.services.mozilla.com/1/%APP%/%VERSION%/%CHANNEL%/%LOCALE%/%REGION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%");
+
 // search bar results always open in a new tab
 pref("browser.search.openintab", false);
 
@@ -441,6 +445,8 @@ pref("browser.search.widget.inNavBar", false);
 // The maximum amount of times the private default banner is shown.
 pref("browser.search.separatePrivateDefault.ui.banner.max", 0);
 
+pref("browser.search.modernConfig", true);
+
 pref("browser.sessionhistory.max_entries", 50);
 
 // Built-in default permissions.

browser/components/build/components.conf

@@ -4,7 +4,15 @@
 # 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/.
 
-Classes = []
+Classes = [
+    {
+        'cid': '{6deb193c-f87d-4078-bc78-5e64655b4d62}',
+        'contract_ids': ['@mozilla.org/browser/directory-provider;1'],
+        'type': 'mozilla::browser::DirectoryProvider',
+        'headers': ['mozilla/browser/DirectoryProvider.h'],
+        'categories': {'xpcom-directory-providers': 'browser-directory-provider'},
+    },
+]
 
 TOOLKIT = buildconfig.substs['MOZ_WIDGET_TOOLKIT']
 

browser/components/build/moz.build

@@ -16,6 +16,7 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../about',
+    '../dirprovider',
     '../migration',
     '../sessionstore',
     '../shell',

browser/components/build/nsBrowserCompsCID.h

@@ -39,3 +39,11 @@
       0xb1, 0x31, 0xd9, 0x3d, 0x7d, 0x70, 0x4f, 0x64 \
     }                                                \
   }
+
+// {6DEB193C-F87D-4078-BC78-5E64655B4D62}
+#define NS_BROWSERDIRECTORYPROVIDER_CID              \
+  {                                                  \
+    0x6deb193c, 0xf87d, 0x4078, {                    \
+      0xbc, 0x78, 0x5e, 0x64, 0x65, 0x5b, 0x4d, 0x62 \
+    }                                                \
+  }

browser/components/dirprovider/DirectoryProvider.cpp

@@ -0,0 +1,168 @@
+/* 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/. */
+
+#include "DirectoryProvider.h"
+
+#include "nsIFile.h"
+#include "nsISimpleEnumerator.h"
+#include "nsIPrefService.h"
+#include "nsIPrefBranch.h"
+
+#include "nsArrayEnumerator.h"
+#include "nsEnumeratorUtils.h"
+#include "nsAppDirectoryServiceDefs.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsCategoryManagerUtils.h"
+#include "nsComponentManagerUtils.h"
+#include "nsCOMArray.h"
+#include "nsDirectoryServiceUtils.h"
+#include "mozilla/ModuleUtils.h"
+#include "mozilla/intl/LocaleService.h"
+#include "nsServiceManagerUtils.h"
+#include "nsString.h"
+#include "nsXULAppAPI.h"
+
+using mozilla::intl::LocaleService;
+
+namespace mozilla {
+namespace browser {
+
+NS_IMPL_ISUPPORTS(DirectoryProvider, nsIDirectoryServiceProvider,
+                  nsIDirectoryServiceProvider2)
+
+NS_IMETHODIMP
+DirectoryProvider::GetFile(const char* aKey, bool* aPersist,
+                           nsIFile** aResult) {
+  return NS_ERROR_FAILURE;
+}
+
+// Appends the distribution-specific search engine directories to the
+// array.  The directory structure is as follows:
+
+// appdir/
+// \- distribution/
+//    \- searchplugins/
+//       |- common/
+//       \- locale/
+//          |- <locale 1>/
+//          ...
+//          \- <locale N>/
+
+// common engines are loaded for all locales.  If there is no locale
+// directory for the current locale, there is a pref:
+// "distribution.searchplugins.defaultLocale"
+// which specifies a default locale to use.
+
+static void AppendDistroSearchDirs(nsIProperties* aDirSvc,
+                                   nsCOMArray<nsIFile>& array) {
+  nsCOMPtr<nsIFile> searchPlugins;
+  nsresult rv = aDirSvc->Get(XRE_APP_DISTRIBUTION_DIR, NS_GET_IID(nsIFile),
+                             getter_AddRefs(searchPlugins));
+  if (NS_FAILED(rv)) return;
+  searchPlugins->AppendNative("searchplugins"_ns);
+
+  nsCOMPtr<nsIFile> commonPlugins;
+  rv = searchPlugins->Clone(getter_AddRefs(commonPlugins));
+  if (NS_SUCCEEDED(rv)) {
+    commonPlugins->AppendNative("common"_ns);
+    array.AppendObject(commonPlugins);
+  }
+
+  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
+  if (prefs) {
+    nsCOMPtr<nsIFile> localePlugins;
+    rv = searchPlugins->Clone(getter_AddRefs(localePlugins));
+    if (NS_FAILED(rv)) return;
+
+    localePlugins->AppendNative("locale"_ns);
+
+    nsAutoCString defLocale;
+    rv = prefs->GetCharPref("distribution.searchplugins.defaultLocale",
+                            defLocale);
+    if (NS_SUCCEEDED(rv)) {
+      nsCOMPtr<nsIFile> defLocalePlugins;
+      rv = localePlugins->Clone(getter_AddRefs(defLocalePlugins));
+      if (NS_SUCCEEDED(rv)) {
+        defLocalePlugins->AppendNative(defLocale);
+        array.AppendObject(defLocalePlugins);
+        return;  // all done
+      }
+    }
+
+    // we didn't have a defaultLocale, use the user agent locale
+    nsAutoCString locale;
+    LocaleService::GetInstance()->GetAppLocaleAsBCP47(locale);
+
+    nsCOMPtr<nsIFile> curLocalePlugins;
+    rv = localePlugins->Clone(getter_AddRefs(curLocalePlugins));
+    if (NS_SUCCEEDED(rv)) {
+      curLocalePlugins->AppendNative(locale);
+      array.AppendObject(curLocalePlugins);
+      return;  // all done
+    }
+  }
+}
+
+NS_IMETHODIMP
+DirectoryProvider::GetFiles(const char* aKey, nsISimpleEnumerator** aResult) {
+  if (!strcmp(aKey, NS_APP_DISTRIBUTION_SEARCH_DIR_LIST)) {
+    nsCOMPtr<nsIProperties> dirSvc(
+        do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID));
+    if (!dirSvc) return NS_ERROR_FAILURE;
+
+    nsCOMArray<nsIFile> distroFiles;
+    AppendDistroSearchDirs(dirSvc, distroFiles);
+
+    return NS_NewArrayEnumerator(aResult, distroFiles, NS_GET_IID(nsIFile));
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+DirectoryProvider::AppendingEnumerator::HasMoreElements(bool* aResult) {
+  *aResult = mNext ? true : false;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+DirectoryProvider::AppendingEnumerator::GetNext(nsISupports** aResult) {
+  if (aResult) NS_ADDREF(*aResult = mNext);
+
+  mNext = nullptr;
+
+  // Ignore all errors
+
+  bool more;
+  while (NS_SUCCEEDED(mBase->HasMoreElements(&more)) && more) {
+    nsCOMPtr<nsISupports> nextbasesupp;
+    mBase->GetNext(getter_AddRefs(nextbasesupp));
+
+    nsCOMPtr<nsIFile> nextbase(do_QueryInterface(nextbasesupp));
+    if (!nextbase) continue;
+
+    nextbase->Clone(getter_AddRefs(mNext));
+    if (!mNext) continue;
+
+    char const* const* i = mAppendList;
+    while (*i) {
+      mNext->AppendNative(nsDependentCString(*i));
+      ++i;
+    }
+
+    mNext = nullptr;
+  }
+
+  return NS_OK;
+}
+
+DirectoryProvider::AppendingEnumerator::AppendingEnumerator(
+    nsISimpleEnumerator* aBase, char const* const* aAppendList)
+    : mBase(aBase), mAppendList(aAppendList) {
+  // Initialize mNext to begin.
+  GetNext(nullptr);
+}
+
+}  // namespace browser
+}  // namespace mozilla

browser/components/dirprovider/DirectoryProvider.h

@@ -0,0 +1,47 @@
+/* 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/. */
+
+#ifndef DirectoryProvider_h__
+#define DirectoryProvider_h__
+
+#include "nsIDirectoryService.h"
+#include "nsComponentManagerUtils.h"
+#include "nsSimpleEnumerator.h"
+#include "mozilla/Attributes.h"
+
+#define NS_BROWSERDIRECTORYPROVIDER_CONTRACTID \
+  "@mozilla.org/browser/directory-provider;1"
+
+namespace mozilla {
+namespace browser {
+
+class DirectoryProvider final : public nsIDirectoryServiceProvider2 {
+ public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIDIRECTORYSERVICEPROVIDER
+  NS_DECL_NSIDIRECTORYSERVICEPROVIDER2
+
+ private:
+  ~DirectoryProvider() {}
+
+  class AppendingEnumerator final : public nsSimpleEnumerator {
+   public:
+    NS_DECL_NSISIMPLEENUMERATOR
+
+    AppendingEnumerator(nsISimpleEnumerator* aBase,
+                        char const* const* aAppendList);
+
+   private:
+    ~AppendingEnumerator() override = default;
+
+    nsCOMPtr<nsISimpleEnumerator> mBase;
+    char const* const* const mAppendList;
+    nsCOMPtr<nsIFile> mNext;
+  };
+};
+
+}  // namespace browser
+}  // namespace mozilla
+
+#endif  // DirectoryProvider_h__

browser/components/dirprovider/moz.build

@@ -0,0 +1,22 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+with Files("**"):
+    BUG_COMPONENT = ("Firefox", "General")
+
+EXPORTS.mozilla.browser += [
+    'DirectoryProvider.h',
+]
+
+SOURCES += [
+    'DirectoryProvider.cpp',
+]
+
+FINAL_LIBRARY = 'browsercomps'
+
+LOCAL_INCLUDES += [
+    '../build'
+]

browser/components/extensions/test/xpcshell/data/list.json

@@ -0,0 +1,8 @@
+{
+  "default": {
+    "searchDefault": "test",
+    "visibleDefaultEngines": [
+      "test", "test2"
+    ]
+  }
+}

browser/components/extensions/test/xpcshell/test_ext_urlbar.js

@@ -42,6 +42,7 @@ const ORIGINAL_NOTIFICATION_TIMEOUT =
 
 add_task(async function startup() {
   Services.prefs.setCharPref("browser.search.region", "US");
+  Services.prefs.setBoolPref("browser.search.geoSpecificDefaults", false);
   Services.prefs.setIntPref("browser.search.addonLoadTimeout", 0);
   Services.prefs.setBoolPref(
     "browser.search.separatePrivateDefault.ui.enabled",

browser/components/extensions/test/xpcshell/xpcshell.ini

@@ -27,10 +27,12 @@ skip-if = tsan # Times out, bug 1612707
 support-files =
   data/test/manifest.json
   data/test2/manifest.json
+  data/list.json
 [test_ext_settings_overrides_search.js]
 [test_ext_settings_overrides_search_mozParam.js]
 support-files =
   data/test/manifest.json
+  data/list.json
 [test_ext_settings_overrides_shutdown.js]
 [test_ext_settings_validate.js]
 [test_ext_topSites.js]