Commit 5bfe12a2 authored by Mark Banner's avatar Mark Banner
Browse files

Bug 1680735 - Rename SearchTelemetry to SearchSERPTelemetry. r=daleharvey 

Differential Revision: https://phabricator.services.mozilla.com/D98791
parent 5cf95b6b

browser/actors/SearchTelemetryChild.jsm→browser/actors/SearchSERPTelemetryChild.jsm

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

"use strict";



var EXPORTED_SYMBOLS = ["SearchTelemetryChild", "ADLINK_CHECK_TIMEOUT_MS"];

var EXPORTED_SYMBOLS = ["SearchSERPTelemetryChild", "ADLINK_CHECK_TIMEOUT_MS"];



const { XPCOMUtils } = ChromeUtils.import(

  "resource://gre/modules/XPCOMUtils.jsm"
@@ -95,7 +95,7 @@ const searchProviders = new SearchProviders(); 
 * page are returned to SearchTelemetry. If no ads are found, no notification is

 * given.

 */

class SearchTelemetryChild extends JSWindowActorChild {

class SearchSERPTelemetryChild extends JSWindowActorChild {

  /**

   * Determines if there is a provider that matches the supplied URL and returns

   * the information associated with that provider.

browser/actors/SearchTelemetryParent.jsm→browser/actors/SearchSERPTelemetryParent.jsm

+5 −5
Original line number Diff line number Diff line
@@ -3,18 +3,18 @@ 
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

"use strict";



var EXPORTED_SYMBOLS = ["SearchTelemetryParent"];

var EXPORTED_SYMBOLS = ["SearchSERPTelemetryParent"];



ChromeUtils.defineModuleGetter(

  this,

  "SearchTelemetry",

  "resource:///modules/SearchTelemetry.jsm"

  "SearchSERPTelemetry",

  "resource:///modules/SearchSERPTelemetry.jsm"

);



class SearchTelemetryParent extends JSWindowActorParent {

class SearchSERPTelemetryParent extends JSWindowActorParent {

  receiveMessage(msg) {

    if (msg.name == "SearchTelemetry:PageInfo") {

      SearchTelemetry.reportPageWithAds(msg.data);

      SearchSERPTelemetry.reportPageWithAds(msg.data);

    }

  }

}

browser/actors/moz.build

+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ FINAL_TARGET_FILES.actors += [ 
    "RefreshBlockerParent.jsm",

    "RFPHelperChild.jsm",

    "RFPHelperParent.jsm",

    "SearchTelemetryChild.jsm",

    "SearchTelemetryParent.jsm",

    "SearchSERPTelemetryChild.jsm",

    "SearchSERPTelemetryParent.jsm",

    "SwitchDocumentDirectionChild.jsm",

    "WebRTCChild.jsm",

    "WebRTCParent.jsm",

browser/base/content/test/performance/browser_startup_content.js

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ const known_scripts = { 
    "resource:///actors/BrowserTabChild.jsm",

    "resource:///actors/LinkHandlerChild.jsm",

    "resource:///actors/PageStyleChild.jsm",

    "resource:///actors/SearchTelemetryChild.jsm",

    "resource:///actors/SearchSERPTelemetryChild.jsm",

    "resource://gre/modules/Readerable.jsm",



    // Telemetry

browser/components/BrowserGlue.jsm

+6 −6
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { 
  SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",

  Sanitizer: "resource:///modules/Sanitizer.jsm",

  SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm",

  SearchTelemetry: "resource:///modules/SearchTelemetry.jsm",

  SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.jsm",

  SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",

  SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",

  TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
@@ -637,12 +637,12 @@ let JSWINDOWACTORS = { 
    enablePreference: "accessibility.blockautorefresh",

  },



  SearchTelemetry: {

  SearchSERPTelemetry: {

    parent: {

      moduleURI: "resource:///actors/SearchTelemetryParent.jsm",

      moduleURI: "resource:///actors/SearchSERPTelemetryParent.jsm",

    },

    child: {

      moduleURI: "resource:///actors/SearchTelemetryChild.jsm",

      moduleURI: "resource:///actors/SearchSERPTelemetryChild.jsm",

      events: {

        DOMContentLoaded: {},

        pageshow: { mozSystemGroup: true },
@@ -2114,7 +2114,7 @@ BrowserGlue.prototype = { 
    }



    BrowserUsageTelemetry.uninit();

    SearchTelemetry.uninit();

    SearchSERPTelemetry.uninit();

    PageThumbs.uninit();

    NewTabUtils.uninit();
@@ -2309,7 +2309,7 @@ BrowserGlue.prototype = { 
    this._windowsWereRestored = true;



    BrowserUsageTelemetry.init();

    SearchTelemetry.init();

    SearchSERPTelemetry.init();



    ExtensionsUI.init();