Merge pull request ampproject#2341 from cramforce/unique-canary

Turn on unique origins for dev channel by default.
ascarpello · Feb 29, 2016 · 17731d5 · 17731d5
2 parents c77afb3 + 624e26e
commit 17731d5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/build-system/tasks/presubmit-checks.js b/build-system/tasks/presubmit-checks.js
@@ -198,6 +198,7 @@ var forbiddenTerms = {
     whitelist: [
       'extensions/amp-access/0.1/amp-access.js',
       'extensions/amp-user-notification/0.1/amp-user-notification.js',
+      'src/3p-frame.js',
       'src/experiments.js',
       'src/service/storage-impl.js',
       'src/service/viewport-impl.js',

diff --git a/src/3p-frame.js b/src/3p-frame.js
@@ -20,7 +20,7 @@ import {getLengthNumeral} from '../src/layout';
 import {getService} from './service';
 import {documentInfoFor} from './document-info';
 import {getMode} from './mode';
-import {isExperimentOn} from './experiments';
+import {isDevChannel} from './experiments';
 import {preconnectFor} from './preconnect';
 import {dashToCamelCase} from './string';
 import {parseUrl, assertHttpsUrl} from './url';
@@ -205,7 +205,7 @@ function getDefaultBootstrapBaseUrl(parentWindow) {
  * @visibleForTesting
  */
 export function getSubDomain(win) {
-  if (!isExperimentOn(win, 'unique-origins')) {
+  if (!isDevChannel(win)) {
     return '3p';
   }
 

diff --git a/test/functional/test-3p-frame.js b/test/functional/test-3p-frame.js
@@ -31,7 +31,7 @@ describe('3p-frame', () => {
   });
 
   afterEach(() => {
-    toggleExperiment(window, 'unique-origins', false);
+    toggleExperiment(window, 'dev-channel', false);
     resetServiceForTesting(window, 'bootstrapBaseUrl');
     setModeForTesting(null);
     const m = document.querySelector(
@@ -160,7 +160,7 @@ describe('3p-frame', () => {
 
   it('should pick the right bootstrap unique url (prod)', () => {
     setModeForTesting({});
-    toggleExperiment(window, 'unique-origins', true);
+    toggleExperiment(window, 'dev-channel', true);
     expect(getBootstrapBaseUrl(window)).to.match(
         /^https:\/\/d-\d+\.ampproject\.net\/\$\internal\w+\$\/frame\.html$/);
   });
@@ -201,13 +201,13 @@ describe('3p-frame', () => {
   });
 
   it('should make sub domains (unique)', () => {
-    toggleExperiment(window, 'unique-origins', true);
+    toggleExperiment(window, 'dev-channel', true);
     expect(getSubDomain(window)).to.match(/^d-\d+$/);
     expect(getSubDomain(window)).to.not.equal('d-00');
   });
 
   it('should make sub domains (Math)', () => {
-    toggleExperiment(window, 'unique-origins', true);
+    toggleExperiment(window, 'dev-channel', true);
     const fakeWin = {
       document: document,
       Math: Math,
@@ -216,7 +216,7 @@ describe('3p-frame', () => {
   });
 
   it('should make sub domains (crypto)', () => {
-    toggleExperiment(window, 'unique-origins', true);
+    toggleExperiment(window, 'dev-channel', true);
     const fakeWin = {
       document: document,
       crypto: {
@@ -230,7 +230,7 @@ describe('3p-frame', () => {
   });
 
   it('should make sub domains (fallback)', () => {
-    toggleExperiment(window, 'unique-origins', true);
+    toggleExperiment(window, 'dev-channel', true);
     const fakeWin = {
       document: document,
       Math: {

diff --git a/tools/experiments/experiments.js b/tools/experiments/experiments.js
@@ -73,12 +73,6 @@ const EXPERIMENTS = [
     spec: 'https://github.com/ampproject/amphtml/blob/master/extensions/' +
         'amp-accordion/amp-accordion.md',
   },
-
-  // Unique 3p origins
-  {
-    id: 'unique-origins',
-    name: 'Unique 3p origins',
-  },
 ];