Revert "metadata(experiment): Closes #1813 Graduate local metadata ex…

…periment"

This reverts commit 1890042.

addon/ActivityStreams.js

@@ -114,7 +114,7 @@ ActivityStreams.prototype = {
     this._tabTracker.init(this.appURLs, this._experimentProvider.experimentId, this._store);
     this._searchProvider.init();
     this._initializePreviewProvier(this._experimentProvider, this._metadataStore, this._tabTracker);
-    this._initializePageScraper(this._previewProvider, this._tabTracker);
+    this._initializePageScraper(this._experimentProvider, this._previewProvider, this._tabTracker);
     this._initializeRecommendationProvider(this._experimentProvider, this._previewProvider, this._tabTracker);
     this._initializeShareProvider(this._tabTracker);
     this._initializePrefProvider();
@@ -217,15 +217,18 @@ ActivityStreams.prototype = {
     }
   },
 
-  _initializePageScraper(previewProvider, tabTracker) {
+  _initializePageScraper(experimentProvider, previewProvider, tabTracker) {
     this._pageScraper = null;
 
-    if (!this.options.pageScraper) {
-      this._pageScraper = new PageScraper(previewProvider, tabTracker);
-    } else {
-      this._pageScraper = this.options.pageScraper;
+    if (experimentProvider.data.localMetadata) {
+      simplePrefs.prefs.pageScraper = true;
+      if (!this.options.pageScraper) {
+        this._pageScraper = new PageScraper(previewProvider, tabTracker);
+      } else {
+        this._pageScraper = this.options.pageScraper;
+      }
+      this._pageScraper.init();
     }
-    this._pageScraper.init();
   },
 
   /**
@@ -426,6 +429,22 @@ ActivityStreams.prototype = {
       this._prefsProvider.actionHandler(args);
     };
     this.on(CONTENT_TO_ADDON, this._contentToAddonHandlers);
+    this._pageScraperListener = this._pageScraperListener.bind(this);
+    simplePrefs.on("pageScraper", this._pageScraperListener);
+  },
+
+  /**
+   * Listen for changes to the page scraper pref
+   */
+  _pageScraperListener() {
+    let newEnabledValue = simplePrefs.prefs.pageScraper;
+    if (newEnabledValue && !this._pageScraper) {
+      this._pageScraper = new PageScraper(this._previewProvider, this._tabTracker);
+      this._pageScraper.init();
+    } else if (!newEnabledValue && this._pageScraper) {
+      this._pageScraper.uninit();
+      this._pageScraper = null;
+    }
   },
 
   /**
@@ -436,6 +455,7 @@ ActivityStreams.prototype = {
     this._searchProvider.off("browser-search-engine-modified", this._handleCurrentEngineChanges);
     this._experimentProvider.off("change", this._handleExperimentChange);
     this.off(CONTENT_TO_ADDON, this._contentToAddonHandlers);
+    simplePrefs.off("pageScraper", this._pageScraperListener);
   },
 
   /**
@@ -579,10 +599,12 @@ ActivityStreams.prototype = {
       }
       this._previewProvider.uninit();
       this._searchProvider.uninit();
-      this._pageScraper.uninit();
       if (this._recommendationProvider) {
         this._recommendationProvider.uninit();
       }
+      if (this._pageScraper) {
+        this._pageScraper.uninit();
+      }
       NewTabURL.reset();
       Services.prefs.clearUserPref("places.favicons.optimizeToDimension");
       this.workers.clear();

experiments.json

@@ -46,7 +46,7 @@
   },
   "localMetadata": {
     "name": "Local Page Scraper",
-    "active": false,
+    "active": true,
     "description": "Locally compute metadata for pages",
     "control": {
       "value": false,

package.json

@@ -177,6 +177,12 @@
       "type": "string",
       "value": "Embedly",
       "hidden": true
+    },
+    {
+      "name": "pageScraper",
+      "title": "Turn on page metadata scraper",
+      "type": "bool",
+      "value": false
     }
   ],
   "repository": "mozilla/activity-stream",