Bug 1562009 - Turn on ad server (#5143)

lib/ActivityStream.jsm

@@ -244,7 +244,7 @@ const PREFS_CONFIG = new Map([
   }],
   ["discoverystream.endpoints", {
     title: "Endpoint prefixes (comma-separated) that are allowed to be requested",
-    value: "https://getpocket.cdn.mozilla.net/",
+    value: "https://getpocket.cdn.mozilla.net/,https://spocs.getpocket.com/",
   }],
   ["discoverystream.spoc.impressions", {
     title: "Track spoc impressions",
@@ -253,7 +253,7 @@ const PREFS_CONFIG = new Map([
   }],
   ["discoverystream.endpointSpocsClear", {
     title: "Endpoint for when a user opts-out of sponsored content to delete the user's data from the ad server.",
-    value: "",
+    value: "https://spocs.getpocket.com/user",
   }],
   ["discoverystream.rec.impressions", {
     title: "Track rec impressions",

lib/DiscoveryStreamFeed.jsm

@@ -1076,7 +1076,7 @@ this.DiscoveryStreamFeed = class DiscoveryStreamFeed {
 // Hardcoded version of layout_variant `3-col-7-row-octr`
 defaultLayoutResp = {
   "spocs": {
-    "url": "https://getpocket.cdn.mozilla.net/v3/firefox/unique-spocs",
+    "url": "https://spocs.getpocket.com/spocs",
     "spocs_per_domain": 1
   },
   "layout": [

test/unit/lib/DiscoveryStreamFeed.test.js

@@ -252,7 +252,7 @@ describe("DiscoveryStreamFeed", () => {
       await feed.loadLayout(feed.store.dispatch);
 
       assert.notCalled(feed.fetchLayout);
-      assert.equal(feed.store.getState().DiscoveryStream.spocs.spocs_endpoint, "https://getpocket.cdn.mozilla.net/v3/firefox/unique-spocs");
+      assert.equal(feed.store.getState().DiscoveryStream.spocs.spocs_endpoint, "https://spocs.getpocket.com/spocs");
     });
     it("should fetch local layout for invalid layout endpoint or when fetch layout fails", async () => {
       feed.config.hardcoded_layout = false;
@@ -261,7 +261,7 @@ describe("DiscoveryStreamFeed", () => {
       await feed.loadLayout(feed.store.dispatch, true);
 
       assert.calledOnce(fetchStub);
-      assert.equal(feed.store.getState().DiscoveryStream.spocs.spocs_endpoint, "https://getpocket.cdn.mozilla.net/v3/firefox/unique-spocs");
+      assert.equal(feed.store.getState().DiscoveryStream.spocs.spocs_endpoint, "https://spocs.getpocket.com/spocs");
     });
   });