Backed out changeset dfbfbeb2abde (bug 1191460) for causing merge conflicts when landing on m-c
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 26 Nov 2015 12:03:17 +0100
changeset 308470 3320ed6efa63f5f900fca00aee43acc40e3f835a
parent 308469 2b986da70ee7a1ebdbd8f95c1f024649638b2fbe
child 308471 6499724b05d08d6eb15e2e67d33e8cd0420f2475
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1191460
milestone45.0a1
backs outdfbfbeb2abde68c704d158c16742f965debf6c72
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset dfbfbeb2abde (bug 1191460) for causing merge conflicts when landing on m-c
browser/components/contextualidentity/moz.build
browser/components/contextualidentity/test/browser/browser.ini
browser/components/contextualidentity/test/browser/browser_usercontext.js
browser/components/contextualidentity/test/browser/file_reflect_cookie_into_title.html
browser/components/moz.build
deleted file mode 100644
--- a/browser/components/contextualidentity/moz.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-BROWSER_CHROME_MANIFESTS += [
-    'test/browser/browser.ini',
-]
-
-with Files('**'):
-    BUG_COMPONENT = ('Firefox', 'Contextual Identity')
deleted file mode 100644
--- a/browser/components/contextualidentity/test/browser/browser.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-skip-if = buildapp == "mulet"
-support-files =
-  file_reflect_cookie_into_title.html
-
-[browser_usercontext.js]
-skip-if = e10s
deleted file mode 100644
--- a/browser/components/contextualidentity/test/browser/browser_usercontext.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-
-const USER_CONTEXTS = [
-  "default",
-  "personal",
-  "work",
-];
-
-const BASE_URI = "http://mochi.test:8888/browser/browser/components/"
-  + "contextualidentity/test/browser/file_reflect_cookie_into_title.html";
-
-
-// opens `uri' in a new tab with the provided userContextId and focuses it.
-// returns the newly opened tab
-function openTabInUserContext(uri, userContextId) {
-  // open the tab in the correct userContextId
-  let tab = gBrowser.addTab(uri, {userContextId});
-
-  // select tab and make sure its browser is focused
-  gBrowser.selectedTab = tab;
-  tab.ownerDocument.defaultView.focus();
-
-  return tab;
-}
-
-add_task(function* setup() {
-  // make sure userContext is enabled.
-  SpecialPowers.pushPrefEnv({"set": [
-    ["privacy.userContext.enabled", true]
-  ]});
-});
-
-add_task(function* cleanup() {
-  // make sure we don't leave any prefs set for the next tests
-  registerCleanupFunction(function() {
-    SpecialPowers.popPrefEnv();
-  });
-});
-
-add_task(function* test() {
-  for (let userContextId of Object.keys(USER_CONTEXTS)) {
-    // load the page in 3 different contexts and set a cookie
-    // which should only be visible in that context
-    let cookie = USER_CONTEXTS[userContextId];
-
-    // open our tab in the given user context
-    let tab = openTabInUserContext(BASE_URI+"?"+cookie, userContextId);
-
-    // wait for tab load
-    yield BrowserTestUtils.browserLoaded(gBrowser.getBrowserForTab(tab));
-
-    // remove the tab
-    gBrowser.removeTab(tab);
-  }
-
-  {
-    // Set a cookie in a different context so we can detect if that affects
-    // cross-context properly. If we don't do that, we get an UNEXPECTED-PASS
-    // for the localStorage case for the last tab we set.
-    let tab = openTabInUserContext(BASE_URI+"?foo", 9999);
-    yield BrowserTestUtils.browserLoaded(gBrowser.getBrowserForTab(tab));
-    gBrowser.removeTab(tab);
-  }
-
-  for (let userContextId of Object.keys(USER_CONTEXTS)) {
-    // Load the page without setting the cookie this time
-    let expectedContext = USER_CONTEXTS[userContextId];
-
-    let tab = openTabInUserContext(BASE_URI, userContextId);
-
-    // wait for load
-    let browser = gBrowser.getBrowserForTab(tab);
-    yield BrowserTestUtils.browserLoaded(browser);
-
-    // get the title
-    let title = browser.contentDocument.title.trim().split("|");
-
-    // check each item in the title and validate it meets expectatations
-    for (let part of title) {
-      let [storageMethodName, value] = part.split("=");
-      let is_f = storageMethodName == "cookie" ? is : todo_is;
-      is_f(value, expectedContext,
-            "the title reflects the expected contextual identity of " +
-            expectedContext + " for method " + storageMethodName + ": " + value);
-    }
-
-    gBrowser.removeTab(tab);
-  }
-});
deleted file mode 100644
--- a/browser/components/contextualidentity/test/browser/file_reflect_cookie_into_title.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <title>title not set</title>
-    <script>
-      // if we have a query string, use it to set the cookie and localStorage
-      if (window.location.search.length > 0) {
-        let context_name = window.location.search.substr(1);
-        document.cookie = "userContextId=" + context_name;
-        localStorage.setItem("userContext", context_name);
-      }
-
-      // get the cookie
-      let [name, val] = document.cookie.split("=");
-
-      // set the title to reflect the cookie and local storage values we find
-      document.title = "cookie=" + val + "|"
-                       + "local=" + localStorage.getItem("userContext");
-    </script>
-  </head>
-  <body></body>
-</html>
-
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -1,17 +1,16 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
     'about',
-    'contextualidentity',
     'customizableui',
     'dirprovider',
     'downloads',
     'extensions',
     'feeds',
     'loop',
     'migration',
     'newtab',