Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 0 insertions, 103 deletions

diff --git a/browser/components/newtab/NewTabSearchProvider.jsm b/browser/components/newtab/NewTabSearchProvider.jsm
deleted file mode 100644
index a50d8c706..000000000
--- a/browser/components/newtab/NewTabSearchProvider.jsm
+++ /dev/null
@@ -1,103 +0,0 @@
-/* global XPCOMUtils, ContentSearch, Task, Services, EventEmitter */
-/* exported NewTabSearchProvider */
-
-"use strict";
-
-this.EXPORTED_SYMBOLS = ["NewTabSearchProvider"];
-
-const {utils: Cu, interfaces: Ci} = Components;
-const CURRENT_ENGINE = "browser-search-engine-modified";
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Task.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "ContentSearch",
-                                  "resource:///modules/ContentSearch.jsm");
-
-XPCOMUtils.defineLazyGetter(this, "EventEmitter", function() {
-  const {EventEmitter} = Cu.import("resource://devtools/shared/event-emitter.js", {});
-  return EventEmitter;
-});
-
-function SearchProvider() {
-  EventEmitter.decorate(this);
-}
-
-SearchProvider.prototype = {
-
-  observe(subject, topic, data) { // jshint unused:false
-    // all other topics are not relevant to content searches and can be
-    // ignored by NewTabSearchProvider
-    if (data === "engine-current" && topic === CURRENT_ENGINE) {
-      Task.spawn(function* () {
-        try {
-          let state = yield ContentSearch.currentStateObj(true);
-          let engine = state.currentEngine;
-          this.emit(CURRENT_ENGINE, engine);
-        } catch (e) {
-          Cu.reportError(e);
-        }
-      }.bind(this));
-    }
-  },
-
-  init() {
-    try {
-      Services.obs.addObserver(this, CURRENT_ENGINE, true);
-    } catch (e) {
-      Cu.reportError(e);
-    }
-  },
-
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
-    Ci.nsISupportsWeakReference
-  ]),
-
-  uninit() {
-    try {
-      Services.obs.removeObserver(this, CURRENT_ENGINE, true);
-    } catch (e) {
-      Cu.reportError(e);
-    }
-  },
-
-  get searchSuggestionUIStrings() {
-    return ContentSearch.searchSuggestionUIStrings;
-  },
-
-  removeFormHistory({browser}, suggestion) {
-    ContentSearch.removeFormHistoryEntry({target: browser}, suggestion);
-  },
-
-  manageEngines(browser) {
-    const browserWin = browser.ownerGlobal;
-    browserWin.openPreferences("paneSearch");
-  },
-
-  asyncGetState: Task.async(function*() {
-    let state = yield ContentSearch.currentStateObj(true);
-    return state;
-  }),
-
-  asyncPerformSearch: Task.async(function*({browser}, searchData) {
-    ContentSearch.performSearch({target: browser}, searchData);
-    yield ContentSearch.addFormHistoryEntry({target: browser}, searchData.searchString);
-  }),
-
-  asyncCycleEngine: Task.async(function*(engineName) {
-    Services.search.currentEngine = Services.search.getEngineByName(engineName);
-    let state = yield ContentSearch.currentStateObj(true);
-    let newEngine = state.currentEngine;
-    this.emit(CURRENT_ENGINE, newEngine);
-  }),
-
-  asyncGetSuggestions: Task.async(function*(engineName, searchString, target) {
-    let suggestions = ContentSearch.getSuggestions(engineName, searchString, target.browser);
-    return suggestions;
-  }),
-};
-
-const NewTabSearchProvider = {
-  search: new SearchProvider(),
-};