Bug 1689383 - Fixing usage of region updated const r=daleharvey

Differential Revision: https://phabricator.services.mozilla.com/D103382

browser/components/newtab/aboutwelcome/AboutWelcomeParent.jsm

@@ -147,11 +147,9 @@ class RegionHomeObserver {
   observe(aSubject, aTopic, aData) {
     switch (aTopic) {
       case Region.REGION_TOPIC:
-        if (aData === Region.REGION_UPDATED) {
+        Services.obs.removeObserver(this, Region.REGION_TOPIC);
-          Services.obs.removeObserver(this, Region.REGION_TOPIC);
+        this.regionHomeDeferred.resolve(Region.home);
-          this.regionHomeDeferred.resolve(Region.home);
+        this.regionHomeDeferred = null;
-          this.regionHomeDeferred = null;
-        }
         break;
     }
   }

browser/components/newtab/lib/ActivityStream.jsm

@@ -831,9 +831,7 @@ this.ActivityStream = class ActivityStream {
   observe(subject, topic, data) {
     switch (topic) {
       case Region.REGION_TOPIC:
-        if (data === Region.REGION_UPDATED) {
+        this._updateDynamicPrefs();
-          this._updateDynamicPrefs();
-        }
         break;
     }
   }

browser/components/newtab/lib/PrefsFeed.jsm

@@ -255,14 +255,12 @@ this.PrefsFeed = class PrefsFeed {
   observe(subject, topic, data) {
     switch (topic) {
       case Region.REGION_TOPIC:
-        if (data === Region.REGION_UPDATED) {
+        this.store.dispatch(
-          this.store.dispatch(
+          ac.BroadcastToContent({
-            ac.BroadcastToContent({
+            type: at.PREF_CHANGED,
-              type: at.PREF_CHANGED,
+            data: { name: "region", value: Region.home },
-              data: { name: "region", value: Region.home },
+          })
-            })
+        );
-          );
-        }
         break;
     }
   }

browser/components/newtab/test/unit/lib/ActivityStream.test.js

@@ -93,11 +93,7 @@ describe("ActivityStream", () => {
   describe("#observe", () => {
     it("should call _updateDynamicPrefs from observe", () => {
       sandbox.stub(as, "_updateDynamicPrefs");
-      as.observe(
+      as.observe(undefined, global.Region.REGION_TOPIC);
-        undefined,
-        global.Region.REGION_TOPIC,
-        global.Region.REGION_UPDATED
-      );
       assert.calledOnce(as._updateDynamicPrefs);
     });
   });

browser/components/newtab/test/unit/lib/PrefsFeed.test.js

@@ -237,11 +237,7 @@ describe("PrefsFeed", () => {
   });
   describe("#observe", () => {
     it("should call dispatch from observe", () => {
-      feed.observe(
+      feed.observe(undefined, global.Region.REGION_TOPIC);
-        undefined,
-        global.Region.REGION_TOPIC,
-        global.Region.REGION_UPDATED
-      );
       assert.calledOnce(feed.store.dispatch);
     });
   });

toolkit/components/search/SearchService.jsm

@@ -2547,10 +2547,8 @@ SearchService.prototype = {
         });
         break;
       case Region.REGION_TOPIC:
-        if (verb == Region.REGION_UPDATED) {
+        logConsole.debug("Region updated:", Region.home);
-          logConsole.debug("Region updated:", Region.home);
+        this._maybeReloadEngines().catch(Cu.reportError);
-          this._maybeReloadEngines().catch(Cu.reportError);
-        }
         break;
     }
   },