From 1da4448e896bba7e439af8c50688ee6acd92cf24 Mon Sep 17 00:00:00 2001
From: k88hudson <k88hudson@gmail.com>
Date: Tue, 7 Mar 2017 14:22:33 -0500
Subject: [PATCH] Bug 1344372: Add override for RemotePageManager in
 AboutNewTab.jsm;r=mconley

MozReview-Commit-ID: 9hpJMtagXur

--HG--
extra : rebase_source : 2ffe6ffdad1ee61ce49ddd0101436020d649ed52
---
 browser/modules/AboutNewTab.jsm | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/browser/modules/AboutNewTab.jsm b/browser/modules/AboutNewTab.jsm
index f93ddfadc8bc..fba64f00c5cb 100644
--- a/browser/modules/AboutNewTab.jsm
+++ b/browser/modules/AboutNewTab.jsm
@@ -24,7 +24,12 @@ var AboutNewTab = {
 
   pageListener: null,
 
+  isOverridden: false,
+
   init() {
+    if (this.isOverridden) {
+      return;
+    }
     this.pageListener = new RemotePages("about:newtab");
     this.pageListener.addMessageListener("NewTab:Customize", this.customize.bind(this));
     this.pageListener.addMessageListener("NewTab:MaybeShowAutoMigrationUndoNotification",
@@ -37,7 +42,19 @@ var AboutNewTab = {
   },
 
   uninit() {
-    this.pageListener.destroy();
-    this.pageListener = null;
+    if (this.pageListener) {
+      this.pageListener.destroy();
+      this.pageListener = null;
+    }
   },
+
+  override() {
+    this.uninit();
+    this.isOverridden = true;
+  },
+
+  reset() {
+    this.isOverridden = false;
+    this.init();
+  }
 };