diff --git a/test/browser-tests/index.html b/test/browser-tests/index.html
index 1c2ffa0..ca73a7e 100644
--- a/test/browser-tests/index.html
+++ b/test/browser-tests/index.html
@@ -33,10 +33,13 @@
   <script src="/node_modules/chai/chai.js"></script>
   <script src="/node_modules/mocha/mocha.js"></script>
   <script src="/node_modules/sinon/pkg/sinon.js"></script>
+  <script src="/node_modules/sw-testing-helpers/src/in-browser-helpers/sw-utils.js"></script>
 
-  <!-- Helper functions will be under window.testHelper -->
-  <script src="/test/libs/helper-functions.js"></script>
-  <script src="/test/libs/state-stub.js"></script>
+  <script src="/test/libs/is-supported.js"></script>
+  <script src="/test/libs/stubs/base-stub.js"></script>
+  <script src="/test/libs/stubs/firefox-stub.js"></script>
+  <script src="/test/libs/stubs/full-stub.js"></script>
+  <script src="/test/libs/state-stub-singleton.js"></script>
 
   <script>mocha.setup({
     ui: 'bdd'
@@ -91,12 +94,12 @@
       // We unregister all service workers, clear all caches and remove
       // All registered iframes
       beforeEach(function() {
-        return testHelper.cleanState();
+        return window.goog.SWHelper.cleanState();
       });
 
       // Clean up after the final test has finished
       after(function() {
-        return testHelper.cleanState();
+        return window.goog.SWHelper.cleanState();
       });
 
       mocha.checkLeaks();
diff --git a/test/browser-tests/push-client/get-permission-state.js b/test/browser-tests/push-client/get-permission-state.js
index c66b61e..3cbe893 100644
--- a/test/browser-tests/push-client/get-permission-state.js
+++ b/test/browser-tests/push-client/get-permission-state.js
@@ -42,7 +42,7 @@ describe('Test getPermissionState()', function() {
   });
 
   it('should return permission status of granted', function() {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('granted');
 
     return window.goog.propel.PropelClient.getPermissionState()
@@ -52,7 +52,7 @@ describe('Test getPermissionState()', function() {
   });
 
   it('should return permission status of default', function() {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('default');
 
     return window.goog.propel.PropelClient.getPermissionState()
@@ -62,7 +62,7 @@ describe('Test getPermissionState()', function() {
   });
 
   it('should return permission status of denied', function() {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('denied');
 
     return window.goog.propel.PropelClient.getPermissionState()
diff --git a/test/browser-tests/push-client/get-registration.js b/test/browser-tests/push-client/get-registration.js
index e2f18e0..b4042d2 100644
--- a/test/browser-tests/push-client/get-registration.js
+++ b/test/browser-tests/push-client/get-registration.js
@@ -44,7 +44,7 @@ describe('Test getRegistration()', function() {
   });
 
   it('should reject due to a bad registration', function(done) {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
 
     const pushClient = new window.goog.propel.PropelClient('/non-existant/sw.js');
     pushClient.getRegistration()
@@ -57,7 +57,7 @@ describe('Test getRegistration()', function() {
   });
 
   it('should resolve with a registration', function() {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setUpRegistration(null);
 
     const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
diff --git a/test/browser-tests/push-client/get-subscription.js b/test/browser-tests/push-client/get-subscription.js
index e507386..8f9db9f 100644
--- a/test/browser-tests/push-client/get-subscription.js
+++ b/test/browser-tests/push-client/get-subscription.js
@@ -47,7 +47,7 @@ describe('Test getSubscription()', function() {
   });
 
   it('should return null when the user isn\'t subscribed', function() {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setUpRegistration(null);
 
     const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
@@ -58,7 +58,7 @@ describe('Test getSubscription()', function() {
   });
 
   it('should return a subscription when the user is subscribed', function() {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('granted');
     stateStub.setUpRegistration(EXAMPLE_SUBSCRIPTION);
 
@@ -77,9 +77,7 @@ describe('Test getSubscription()', function() {
   });
 
   it('should manage a failing pushManager.getSubscription() call', function(done) {
-    stateStub = new window.StateStub({
-      forceStub: true
-    });
+    stateStub = window.StateStub.getStub(true);
     // Empty function will caused an error to be throw
     stateStub.setUpRegistration();
 
diff --git a/test/browser-tests/push-client/request-permission.js b/test/browser-tests/push-client/request-permission.js
index 555e9dc..2ae2af2 100644
--- a/test/browser-tests/push-client/request-permission.js
+++ b/test/browser-tests/push-client/request-permission.js
@@ -44,9 +44,7 @@ describe('Test requestPermission()', function() {
 
   // We can't surpress a dialog after requesting it so force stub
   it('should dispatch a \'requestingpermission\' event when the permission state is default', function(done) {
-    stateStub = new window.StateStub({
-      forceStub: true
-    });
+    stateStub = window.StateStub.getStub(true);
     stateStub.setPermissionState('default');
     stateStub.setUpRegistration(null);
 
@@ -59,9 +57,7 @@ describe('Test requestPermission()', function() {
 
   // We can't surpress a dialog after requesting it so force stub
   it('should resolve to default', function() {
-    stateStub = new window.StateStub({
-      forceStub: true
-    });
+    stateStub = window.StateStub.getStub(true);
     stateStub.setPermissionState('default');
     stateStub.setUpRegistration(null);
 
@@ -73,7 +69,7 @@ describe('Test requestPermission()', function() {
   });
 
   it('should not dispatch a \'requestingpermission\' event because permission is granted', function(done) {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('granted');
     stateStub.setUpRegistration(null);
 
@@ -86,7 +82,7 @@ describe('Test requestPermission()', function() {
   });
 
   it('should resolve to permission state of granted', function() {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('granted');
     stateStub.setUpRegistration(null);
 
@@ -98,7 +94,7 @@ describe('Test requestPermission()', function() {
   });
 
   it('should not dispatch a \'requestingpermission\' event because permission is blocked', function(done) {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('denied');
     stateStub.setUpRegistration(null);
 
@@ -111,7 +107,7 @@ describe('Test requestPermission()', function() {
   });
 
   it('should resolve to blocked', function() {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('denied');
     stateStub.setUpRegistration(null);
 
@@ -123,7 +119,7 @@ describe('Test requestPermission()', function() {
   });
 
   it('should dispatch a \'statuschange\' event when called directly', function(done) {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('granted');
     stateStub.setUpRegistration(null);
 
diff --git a/test/browser-tests/push-client/status-change-event.js b/test/browser-tests/push-client/status-change-event.js
index 6ef4abf..f248110 100644
--- a/test/browser-tests/push-client/status-change-event.js
+++ b/test/browser-tests/push-client/status-change-event.js
@@ -47,7 +47,7 @@ describe('Test \'statuschange\' event', function() {
   });
 
   it('should dispatch a \'statuschange\' event when the constructor is created (permission: default, subscription: null)', function(done) {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('default');
     stateStub.setUpRegistration(null);
 
@@ -63,7 +63,7 @@ describe('Test \'statuschange\' event', function() {
   });
 
   it('should dispatch a \'statuschange\' event when the constructor is created (permission: blocked, subscription: null)', function(done) {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('denied');
     stateStub.setUpRegistration(null);
 
@@ -79,7 +79,7 @@ describe('Test \'statuschange\' event', function() {
   });
 
   it('should dispatch a \'statuschange\' event when the constructor is created (permission: granted, subscription: null)', function(done) {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('granted');
     stateStub.setUpRegistration(null);
 
@@ -95,7 +95,7 @@ describe('Test \'statuschange\' event', function() {
   });
 
   it('should dispatch a \'statuschange\' event when the constructor is created (permission: granted, subscription: {STUBBED})', function(done) {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('granted');
     stateStub.setUpRegistration(EXAMPLE_SUBSCRIPTION);
 
diff --git a/test/browser-tests/push-client/subscribe.js b/test/browser-tests/push-client/subscribe.js
index 07522ab..93f39aa 100644
--- a/test/browser-tests/push-client/subscribe.js
+++ b/test/browser-tests/push-client/subscribe.js
@@ -47,9 +47,7 @@ describe('Test subscribe()', function() {
   });
 
   it('should return an error that the user dismissed the notification', function(done) {
-    stateStub = new window.StateStub({
-      forceStub: true
-    });
+    stateStub = window.StateStub.getStub(true);
     stateStub.setPermissionState('default');
     stateStub.setUpRegistration(null);
 
@@ -65,7 +63,7 @@ describe('Test subscribe()', function() {
   });
 
   it('should dispatch a status event if the notification permission is blocked', function(done) {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('denied');
     stateStub.setUpRegistration(null);
 
@@ -90,7 +88,7 @@ describe('Test subscribe()', function() {
   });
 
   it('should reject the promise with an error that the user has blocked notifications', function(done) {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('denied');
     stateStub.setUpRegistration(null);
 
@@ -106,7 +104,7 @@ describe('Test subscribe()', function() {
   });
 
   it('should dispatch a status event with the subscription when the permission is granted', function(done) {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('granted');
     stateStub.setUpRegistration(EXAMPLE_SUBSCRIPTION);
 
@@ -131,7 +129,7 @@ describe('Test subscribe()', function() {
   });
 
   it('should resolve the promise with a subscription when notifications are granted', function(done) {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('granted');
     stateStub.setUpRegistration(EXAMPLE_SUBSCRIPTION);
 
@@ -148,9 +146,7 @@ describe('Test subscribe()', function() {
   });
 
   it('should dispath events in order, requestingpermission, requestingsubscription and statuschange', function(done) {
-    stateStub = new window.StateStub({
-      forceStub: false
-    });
+    stateStub = window.StateStub.getStub(true);
     stateStub.setPermissionState('default');
     stateStub.setUpRegistration(EXAMPLE_SUBSCRIPTION);
 
diff --git a/test/browser-tests/push-client/unsubscribe.js b/test/browser-tests/push-client/unsubscribe.js
index 598928a..31f0120 100644
--- a/test/browser-tests/push-client/unsubscribe.js
+++ b/test/browser-tests/push-client/unsubscribe.js
@@ -47,7 +47,7 @@ describe('Test unsubscribe()', function() {
   });
 
   it('should unsubscribe the current subscription', function() {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('granted');
     stateStub.setUpRegistration(EXAMPLE_SUBSCRIPTION);
 
@@ -65,7 +65,7 @@ describe('Test unsubscribe()', function() {
   });
 
   it('should unsubscribe the current subscription and dispatch a statuschange event', function(done) {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('granted');
     stateStub.setUpRegistration(EXAMPLE_SUBSCRIPTION);
 
@@ -97,7 +97,7 @@ describe('Test unsubscribe()', function() {
   });
 
   it('should resolve promise when no registration is available', function() {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('default');
 
     const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
@@ -105,7 +105,7 @@ describe('Test unsubscribe()', function() {
   });
 
   it('should dispatch a status event when no registration is available', function(done) {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('default');
 
     let statuschangeCounter = 0;
@@ -127,7 +127,7 @@ describe('Test unsubscribe()', function() {
   });
 
   it('should resolve promise when no subscription is available', function() {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('default');
     stateStub.setUpRegistration(null);
 
@@ -136,7 +136,7 @@ describe('Test unsubscribe()', function() {
   });
 
   it('should dispatch a status event when no subscription is available', function(done) {
-    stateStub = new window.StateStub();
+    stateStub = window.StateStub.getStub();
     stateStub.setPermissionState('default');
     stateStub.setUpRegistration(null);
 
diff --git a/test/libs/helper-functions.js b/test/libs/helper-functions.js
deleted file mode 100644
index f05af25..0000000
--- a/test/libs/helper-functions.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright 2016 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-/* eslint-env browser */
-
-window.testHelper = {
-  unregisterAllRegistrations: function() {
-    return navigator.serviceWorker.getRegistrations()
-      .then(registrations => {
-        return Promise.all(registrations.map(registration => {
-          registration.unregister();
-        }));
-      });
-  },
-
-  clearAllCaches: function() {
-    return window.caches.keys()
-      .then(cacheNames => {
-        return Promise.all(cacheNames.map(cacheName => {
-          window.caches.delete(cacheName);
-        }));
-      });
-  },
-
-  // Helper to unregister all service workers and clean all caches
-  // This should be called before each test
-  cleanState: function() {
-    return Promise.all([
-      this.unregisterAllRegistrations(),
-      this.clearAllCaches()
-    ])
-    .then(() => {
-      var iframeList = document.querySelectorAll('.js-test-iframe');
-      for (var i = 0; i < iframeList.length; i++) {
-        iframeList[i].parentElement.removeChild(iframeList[i]);
-      }
-    });
-  }
-};
diff --git a/test/libs/state-stub-singleton.js b/test/libs/state-stub-singleton.js
new file mode 100644
index 0000000..072f2ee
--- /dev/null
+++ b/test/libs/state-stub-singleton.js
@@ -0,0 +1,51 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+'use strict';
+
+// Services is available in FF if we have correct flags set
+// (See automated-test-suite.js for what is set)
+/* global Services */
+/* eslint-env browser */
+
+window.StateStub = {
+  getStub: forceFullStub => {
+    if (forceFullStub) {
+      return new window.FullStateStub();
+    }
+
+    let useFFPermissions = false;
+
+    if (
+      typeof window.netscape !== 'undefined' &&
+      typeof window.netscape.security !== 'undefined' &&
+      typeof window.netscape.security.PrivilegeManager !== 'undefined'
+    ) {
+      // IF here we are in FF with ability to alter permission state
+      window.netscape.security.PrivilegeManager
+        .enablePrivilege('UniversalXPConnect');
+      window.Components.utils.import('resource://gre/modules/Services.jsm');
+
+      useFFPermissions = (typeof Services !== 'undefined');
+    }
+
+    if (useFFPermissions) {
+      return new window.FFStateStub();
+    }
+
+    return new window.FullStateStub();
+  }
+};
diff --git a/test/libs/stubs/base-stub.js b/test/libs/stubs/base-stub.js
new file mode 100644
index 0000000..b236edf
--- /dev/null
+++ b/test/libs/stubs/base-stub.js
@@ -0,0 +1,42 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+'use strict';
+
+/* eslint-env browser */
+
+const DEFAULT_PERMISSION_STATE = 'default';
+
+class BaseStateStub {
+  constructor() {
+    this.setPermissionState(DEFAULT_PERMISSION_STATE);
+    this._currentRegistration = null;
+  }
+
+  restore() {
+    throw new Error('restore() must be overriden');
+  }
+
+  setPermissionState() {
+    throw new Error('setPermissionState() must be overriden');
+  }
+
+  setUpRegistration() {
+    throw new Error('setUpRegistration() must be overriden');
+  }
+}
+
+window.BaseStateStub = BaseStateStub;
diff --git a/test/libs/stubs/firefox-stub.js b/test/libs/stubs/firefox-stub.js
new file mode 100644
index 0000000..60eb6a2
--- /dev/null
+++ b/test/libs/stubs/firefox-stub.js
@@ -0,0 +1,74 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+'use strict';
+
+// Services is available in FF if we have correct flags set
+// (See automated-test-suite.js for what is set)
+/* global Services */
+/* eslint-env browser */
+
+class FFStateStub extends window.BaseStateStub {
+  constructor() {
+    super();
+  }
+
+  restore() {
+    window.netscape.security.PrivilegeManager
+      .enablePrivilege('UniversalXPConnect');
+    window.Components.utils.import('resource://gre/modules/Services.jsm');
+
+    const uri = Services.io.newURI(window.location.origin, null, null);
+    const principal = Services.scriptSecurityManager
+      .getNoAppCodebasePrincipal(uri);
+    Services.perms.addFromPrincipal(principal, 'desktop-notification',
+      Services.perms.PROMPT_ACTION);
+  }
+
+  setPermissionState(newState) {
+    let permissionState;
+    switch (newState) {
+      case 'granted':
+        permissionState = Services.perms.ALLOW_ACTION;
+        break;
+      case 'denied':
+        permissionState = Services.perms.DENY_ACTION;
+        break;
+      case 'default':
+        permissionState = Services.perms.PROMPT_ACTION;
+        break;
+      default:
+        throw new Error(`Unexpected permission state given: '${newState}' `);
+    }
+
+    window.netscape.security.PrivilegeManager
+      .enablePrivilege('UniversalXPConnect');
+    window.Components.utils.import('resource://gre/modules/Services.jsm');
+
+    // ALLOW_ACTION, DENY_ACTION, PROMPT_ACTION
+    const uri = Services.io.newURI(window.location.origin, null, null);
+    const principal = Services.scriptSecurityManager
+      .getNoAppCodebasePrincipal(uri);
+    Services.perms.addFromPrincipal(principal, 'desktop-notification',
+      permissionState);
+  }
+
+  setUpRegistration() {
+    // NOOP - We use actual SW registration etc
+  }
+}
+
+window.FFStateStub = FFStateStub;
diff --git a/test/libs/state-stub.js b/test/libs/stubs/full-stub.js
similarity index 51%
rename from test/libs/state-stub.js
rename to test/libs/stubs/full-stub.js
index 3d7e966..42a7d47 100644
--- a/test/libs/state-stub.js
+++ b/test/libs/stubs/full-stub.js
@@ -16,43 +16,15 @@
 
 'use strict';
 
+/* global sinon */
 /* eslint-env browser */
 
-// Services is available in FF if we have correct flags set
-// (See automated-test-suite.js for what is set)
-/* global Services */
+class FullStateStub extends window.BaseStateStub {
+  constructor() {
+    super();
 
-const sinon = window.sinon;
-
-const DEFAULT_PERMISSION_STATE = 'default';
-
-class StateStub {
-  constructor(options) {
     this.allStubs = [];
 
-    this.setPermissionState(DEFAULT_PERMISSION_STATE);
-    this._currentRegistration = null;
-
-    this._useFFPermissions = false;
-
-    if (
-      typeof window.netscape !== 'undefined' &&
-      typeof window.netscape.security !== 'undefined' &&
-      typeof window.netscape.security.PrivilegeManager !== 'undefined' &&
-      (!options || !options.forceStub)
-    ) {
-      // IF here we are in FF with ability to alter permission state
-      window.netscape.security.PrivilegeManager
-        .enablePrivilege('UniversalXPConnect');
-      window.Components.utils.import('resource://gre/modules/Services.jsm');
-
-      this._useFFPermissions = (typeof Services !== 'undefined');
-    }
-
-    if (this._useFFPermissions) {
-      return;
-    }
-
     // Fallbacks for browsers where we can't pre-select the permission dialog
     const permissionQueryStub = sinon.stub(window.goog.propel.PropelClient,
       'getPermissionState',
@@ -100,25 +72,20 @@ class StateStub {
   }
 
   restore() {
-    if (this._useFFPermissions) {
-      window.netscape.security
-        .PrivilegeManager.enablePrivilege('UniversalXPConnect');
-      window.Components.utils.import('resource://gre/modules/Services.jsm');
-
-      // ALLOW_ACTION, DENY_ACTION, PROMPT_ACTION
-      const uri = Services.io.newURI(window.location.origin, null, null);
-      const principal = Services.scriptSecurityManager
-        .getNoAppCodebasePrincipal(uri);
-      Services.perms.addFromPrincipal(principal,
-        'desktop-notification', Services.perms.PROMPT_ACTION);
-    }
-
     this.allStubs.forEach(stub => {
       stub.restore();
     });
   }
 
-  buildSWRegistration(subscription) {
+  setPermissionState(newState) {
+    this._currentPermission = newState;
+  }
+
+  setUpRegistration(subscription) {
+    this._currentRegistration = this._buildSWRegistration(subscription);
+  }
+
+  _buildSWRegistration(subscription) {
     let innerSubscription = subscription;
     if (innerSubscription) {
       innerSubscription.unsubscribe = () => {
@@ -148,54 +115,6 @@ class StateStub {
       }
     };
   }
-
-  setPermissionState(newState) {
-    this._currentPermission = newState;
-
-    if (this._useFFPermissions) {
-      let permissionState;
-      switch (newState) {
-        case 'granted':
-          permissionState = Services.perms.ALLOW_ACTION;
-          break;
-        case 'denied':
-          permissionState = Services.perms.DENY_ACTION;
-          break;
-        case 'default':
-          permissionState = Services.perms.PROMPT_ACTION;
-          break;
-        default:
-          throw new Error(`Unexpected permission state given: '${newState}' `);
-      }
-
-      window.netscape.security
-        .PrivilegeManager.enablePrivilege('UniversalXPConnect');
-      window.Components.utils.import('resource://gre/modules/Services.jsm');
-
-      // ALLOW_ACTION, DENY_ACTION, PROMPT_ACTION
-      const uri = Services.io.newURI(window.location.origin, null, null);
-      const principal =
-        Services.scriptSecurityManager.getNoAppCodebasePrincipal(uri);
-      Services.perms.addFromPrincipal(principal,
-        'desktop-notification', permissionState);
-    }
-  }
-
-  setUpRegistration(subscription) {
-    if (this._useFFPermissions) {
-      return;
-    }
-
-    this._currentRegistration = this.buildSWRegistration(subscription);
-  }
-
-  /** get permissionState() {
-    return this._currentPermission;
-  }**/
-
-  /** get registration() {
-    return this._currentRegistration;
-  }**/
 }
 
-window.StateStub = StateStub;
+window.FullStateStub = FullStateStub;