Bug 1164159 - Stop using a wrappedJSObject hack to access nsIBrowserSearchService.getDefaultEngineInfo, r=markh.

netwerk/base/nsIBrowserSearchService.idl

@@ -253,7 +253,7 @@ interface nsIBrowserSearchInitObserver : nsISupports
   void onInitComplete(in nsresult aStatus);
 };
 
-[scriptable, uuid(75731859-c7b1-4edf-8d1c-3d4d79a55d1d)]
+[scriptable, uuid(150ef720-bbe2-4169-b9f3-ef7ec0654ced)]
 interface nsIBrowserSearchService : nsISupports
 {
   /**
@@ -450,6 +450,15 @@ interface nsIBrowserSearchService : nsISupports
    */
   attribute nsISearchEngine currentEngine;
 
+  /**
+   * Gets a representation of the default engine in an anonymized JSON
+   * string suitable for recording in the Telemetry environment.
+   *
+   * @return an object containing anonymized info about the default engine:
+   *         name, loadPath, submissionURL (for default engines).
+   */
+  jsval getDefaultEngineInfo();
+
   /**
    * Determines if the provided URL represents results from a search engine, and
    * provides details about the match.

toolkit/components/search/nsSearchService.js

@@ -3269,10 +3269,6 @@ function SearchService() {
 SearchService.prototype = {
   classID: Components.ID("{7319788a-fe93-4db3-9f39-818cf08f4256}"),
 
-  get wrappedJSObject() {
-    return this;
-  },
-
   // The current status of initialization. Note that it does not determine if
   // initialization is complete, only if an error has been encountered so far.
   _initRV: Cr.NS_OK,

toolkit/components/telemetry/TelemetryEnvironment.jsm

@@ -881,7 +881,7 @@ EnvironmentCache.prototype = {
     // Update the search engine entry in the current environment.
     this._currentEnvironment.settings.defaultSearchEngine = this._getDefaultSearchEngine();
     this._currentEnvironment.settings.defaultSearchEngineData =
-      Services.search.wrappedJSObject.getDefaultEngineInfo();
+      Services.search.getDefaultEngineInfo();
   },
 
   /**