Backed out changeset 858d04f452e2 (bug 1555661) for Build bustage. CLOSED TREE
authorDorel Luca <dluca@mozilla.com>
Fri, 31 May 2019 14:16:03 +0300
changeset 476354 80554fedd3aa7fb1d52dc1c83abb226e0c6046fe
parent 476353 858d04f452e2d4344a79dd83dc49749c41162c7e
child 476355 1bd9072aad08f61e9e239b45792b5494407b1b1c
push id36092
push userarchaeopteryx@coole-files.de
push dateFri, 31 May 2019 17:03:46 +0000
treeherdermozilla-central@8384972e1f6a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1555661
milestone69.0a1
backs out858d04f452e2d4344a79dd83dc49749c41162c7e
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
Backed out changeset 858d04f452e2 (bug 1555661) for Build bustage. CLOSED TREE
CLOBBER
browser/components/search/extensions/google/_locales/2018/messages.json
browser/components/search/extensions/google/_locales/b-1-d/messages.json
browser/components/search/extensions/google/_locales/b-1-e/messages.json
browser/components/search/extensions/google/_locales/b-d/messages.json
browser/components/search/extensions/google/_locales/b-e/messages.json
browser/components/search/extensions/google/_locales/en/messages.json
browser/components/search/extensions/google/manifest.json
toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1555661 - Clobber due to search engine file removals (bug 1552120)
+Bug 1551084 - Part 2. Make QCMS transform files use C++. r=miko
new file mode 100644
--- /dev/null
+++ b/browser/components/search/extensions/google/_locales/2018/messages.json
@@ -0,0 +1,26 @@
+{
+  "extensionName": {
+    "message": "Google"
+  },
+  "extensionDescription": {
+    "message": "Google Search"
+  },
+  "searchUrl": {
+    "message": "https://www.google.com/search"
+  },
+  "searchForm": {
+    "message": "https://www.google.com/search?q={searchTerms}"
+  },
+  "suggestUrl": {
+    "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
+  },
+  "searchUrlGetParams": {
+    "message": "q={searchTerms}"
+  },
+  "param_keyword": {
+    "message": "firefox-b-1-ab"
+  },
+  "param_searchbar": {
+    "message": "firefox-b-1"
+  }
+}
\ No newline at end of file
--- a/browser/components/search/extensions/google/_locales/b-1-d/messages.json
+++ b/browser/components/search/extensions/google/_locales/b-1-d/messages.json
@@ -11,13 +11,10 @@
   "searchForm": {
     "message": "https://www.google.com/search?client=firefox-b-1-d&q={searchTerms}"
   },
   "suggestUrl": {
     "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
   },
   "searchUrlGetParams": {
     "message": "client=firefox-b-1-d&q={searchTerms}"
-  },
-  "channelPref": {
-    "message": "google_channel_us"
   }
-}
+}
\ No newline at end of file
--- a/browser/components/search/extensions/google/_locales/b-1-e/messages.json
+++ b/browser/components/search/extensions/google/_locales/b-1-e/messages.json
@@ -11,13 +11,10 @@
   "searchForm": {
     "message": "https://www.google.com/search?client=firefox-b-1-e&q={searchTerms}"
   },
   "suggestUrl": {
     "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
   },
   "searchUrlGetParams": {
     "message": "client=firefox-b-1-e&q={searchTerms}"
-  },
-  "channelPref": {
-    "message": "google_channel_us"
   }
-}
+}
\ No newline at end of file
--- a/browser/components/search/extensions/google/_locales/b-d/messages.json
+++ b/browser/components/search/extensions/google/_locales/b-d/messages.json
@@ -11,13 +11,10 @@
   "searchForm": {
     "message": "https://www.google.com/search?client=firefox-b-d&q={searchTerms}"
   },
   "suggestUrl": {
     "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
   },
   "searchUrlGetParams": {
     "message": "client=firefox-b-d&q={searchTerms}"
-  },
-  "channelPref": {
-    "message": "google_channel_row"
   }
-}
+}
\ No newline at end of file
--- a/browser/components/search/extensions/google/_locales/b-e/messages.json
+++ b/browser/components/search/extensions/google/_locales/b-e/messages.json
@@ -11,13 +11,10 @@
   "searchForm": {
     "message": "https://www.google.com/search?client=firefox-b-e&q={searchTerms}"
   },
   "suggestUrl": {
     "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
   },
   "searchUrlGetParams": {
     "message": "client=firefox-b-e&q={searchTerms}"
-  },
-  "channelPref": {
-    "message": "google_channel_row"
   }
-}
+}
\ No newline at end of file
--- a/browser/components/search/extensions/google/_locales/en/messages.json
+++ b/browser/components/search/extensions/google/_locales/en/messages.json
@@ -4,20 +4,23 @@
   },
   "extensionDescription": {
     "message": "Google Search"
   },
   "searchUrl": {
     "message": "https://www.google.com/search"
   },
   "searchForm": {
-    "message": "https://www.google.com/search?client=firefox-b-d&q={searchTerms}"
+    "message": "https://www.google.com/search?q={searchTerms}"
   },
   "suggestUrl": {
     "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
   },
   "searchUrlGetParams": {
-    "message": "client=firefox-b-d&q={searchTerms}"
+    "message": "q={searchTerms}"
+  },
+  "param_keyword": {
+    "message": "firefox-b-ab"
   },
-  "channelPref": {
-    "message": "google_channel_row"
+  "param_searchbar": {
+    "message": "firefox-b"
   }
-}
+}
\ No newline at end of file
--- a/browser/components/search/extensions/google/manifest.json
+++ b/browser/components/search/extensions/google/manifest.json
@@ -19,17 +19,29 @@
   "chrome_settings_overrides": {
     "search_provider": {
       "name": "__MSG_extensionName__",
       "search_url": "__MSG_searchUrl__",
       "search_form": "__MSG_searchForm__",
       "suggest_url": "__MSG_suggestUrl__",
       "params": [
         {
+          "name": "client",
+          "condition": "purpose",
+          "purpose": "keyword",
+          "value": "__MSG_param_keyword__"
+        },
+        {
+          "name": "client",
+          "condition": "purpose",
+          "purpose": "searchbar",
+          "value": "__MSG_param_searchbar__"
+        },
+        {
           "name": "channel",
           "condition": "pref",
-          "pref": "__MSG_channel_pref__"
+          "pref": "google_channel_us"
         }
       ],
       "search_url_get_params": "__MSG_searchUrlGetParams__"
     }
   }
 }
--- a/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js
+++ b/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js
@@ -398,23 +398,18 @@ class SearchConfigTest {
    *   Rules to test.
    */
   _assertCorrectCodes(location, engine, rules) {
     for (const purpose of SUBMISSION_PURPOSES) {
       // Don't need to repeat the code if we use it for all purposes.
       const code = (typeof rules.codes === "string") ? rules.codes :
        rules.codes[purpose];
       const submission = engine.getSubmission("test", "text/html", purpose);
-      const submissionQueryParams = submission.uri.query.split("&");
-      this.assertOk(submissionQueryParams.includes(code),
+      this.assertOk(submission.uri.query.split("&").includes(code),
         `Expected "${code}" in url "${submission.uri.spec}" from purpose "${purpose}" ${location}`);
-
-      const paramName = code.split("=")[0];
-      this.assertOk(submissionQueryParams.filter(param => param.startsWith(paramName)).length == 1,
-        `Expected only one "${paramName}" parameter in "${submission.uri.spec}" from purpose "${purpose}" ${location}`);
     }
   }
 
   /**
    * Asserts whether the engine is using the correct URL codes or not.
    *
    * @param {string} location
    *   Debug string with locale + region information.