Backed out changeset 4eba57a286d7 (bug 806168)
authorJustin Lebar <justin.lebar@gmail.com>
Tue, 30 Oct 2012 21:35:44 -0400
changeset 111977 8c25f2a7a2f0d323c780a67102352005edccb919
parent 111976 22890a4e431f8d2e094b9700e134004fc5d05b38
child 111978 2633b018c0a052acab4cb25f8f5c385162990627
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
bugs806168
milestone19.0a1
backs out4eba57a286d7e8bd3423f81eb5628dc381f0cd18
Backed out changeset 4eba57a286d7 (bug 806168)
dom/indexedDB/test/webapp_clearBrowserData.js
--- a/dom/indexedDB/test/webapp_clearBrowserData.js
+++ b/dom/indexedDB/test/webapp_clearBrowserData.js
@@ -1,147 +1,151 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-"use strict";
+// This file has 4 leading spaces so that hg/git can tell that it's copied
+// from test_webapp_clearBrowserData.html.  We'll fix the indentation in
+// the next commit.
 
-const appDomain = "example.org";
-const manifestURL =
-  location.protocol + "//" + appDomain + "/manifest.webapp";
+    "use strict";
 
-function testSteps()
-{
-  const objectStoreName = "foo";
-  const testKey = 1;
-  const testValue = objectStoreName;
+    const appDomain = "example.org";
+    const manifestURL =
+      location.protocol + "//" + appDomain + "/manifest.webapp";
+
+    function testSteps()
+    {
+      const objectStoreName = "foo";
+      const testKey = 1;
+      const testValue = objectStoreName;
 
-  // Determine whether the app and browser frames should be in or
-  // out-of-process.
-  let remote_app, remote_browser;
-  if (window.location.href.indexOf("inproc_oop") != -1) {
-    remote_app = false;
-    remote_browser = true;
-  }
-  else if (window.location.href.indexOf("oop_inproc") != -1) {
-    remote_app = true;
-    remote_browser = false;
-  }
-  else if (window.location.href.indexOf("inproc_inproc") != -1) {
-    remote_app = false;
-    remote_browser = false;
-  }
-  else {
-    ok(false, "Bad test filename!");
-    return;
-  }
+      // Determine whether the app and browser frames should be in or
+      // out-of-process.
+      let remote_app, remote_browser;
+      if (window.location.href.indexOf("inproc_oop") != -1) {
+        remote_app = false;
+        remote_browser = true;
+      }
+      else if (window.location.href.indexOf("oop_inproc") != -1) {
+        remote_app = true;
+        remote_browser = false;
+      }
+      else if (window.location.href.indexOf("inproc_inproc") != -1) {
+        remote_app = false;
+        remote_browser = false;
+      }
+      else {
+        ok(false, "Bad test filename!");
+        return;
+      }
 
-  let request = indexedDB.open(window.location.pathname, 1);
-  request.onerror = errorHandler;
-  request.onupgradeneeded = grabEventAndContinueHandler;
-  request.onsuccess = unexpectedSuccessHandler;
-  let event = yield;
+      let request = indexedDB.open(window.location.pathname, 1);
+      request.onerror = errorHandler;
+      request.onupgradeneeded = grabEventAndContinueHandler;
+      request.onsuccess = unexpectedSuccessHandler;
+      let event = yield;
 
-  let db = event.target.result;
-  db.onerror = errorHandler;
-  db.onversionchange = function(event) {
-    event.target.close();
-  }
+      let db = event.target.result;
+      db.onerror = errorHandler;
+      db.onversionchange = function(event) {
+        event.target.close();
+      }
 
-  let objectStore = db.createObjectStore(objectStoreName);
-  objectStore.add(testValue, testKey);
+      let objectStore = db.createObjectStore(objectStoreName);
+      objectStore.add(testValue, testKey);
 
-  request.onsuccess = grabEventAndContinueHandler;
-  event = yield;
+      request.onsuccess = grabEventAndContinueHandler;
+      event = yield;
 
-  // We need to send both remote_browser and remote_app in the querystring
-  // because webapp_clearBrowserData_appFrame uses the path + querystring to
-  // create and open a database which it checks no other test has touched.  If
-  // we sent only remote_browser, then we wouldn't be able to test both
-  // (remote_app==false, remote_browser==false) and (remote_app==true,
-  // remote_browser==false).
-  let srcURL = location.protocol + "//" + appDomain +
-    location.pathname.substring(0, location.pathname.lastIndexOf('/')) +
-    "/webapp_clearBrowserData_appFrame.html?" +
-    "remote_browser=" + remote_browser + "&" +
-    "remote_app=" + remote_app;
+      // We need to send both remote_browser and remote_app in the querystring
+      // because webapp_clearBrowserData_appFrame uses the path + querystring to
+      // create and open a database which it checks no other test has touched.  If
+      // we sent only remote_browser, then we wouldn't be able to test both
+      // (remote_app==false, remote_browser==false) and (remote_app==true,
+      // remote_browser==false).
+      let srcURL = location.protocol + "//" + appDomain +
+        location.pathname.substring(0, location.pathname.lastIndexOf('/')) +
+        "/webapp_clearBrowserData_appFrame.html?" +
+        "remote_browser=" + remote_browser + "&" +
+        "remote_app=" + remote_app;
 
-  let iframe = document.createElement("iframe");
-  iframe.setAttribute("mozbrowser", "");
-  iframe.setAttribute("mozapp", manifestURL);
-  iframe.setAttribute("src", srcURL);
-  iframe.setAttribute("remote", remote_app);
-  iframe.addEventListener("mozbrowsershowmodalprompt", function(event) {
-    let message = JSON.parse(event.detail.message);
-    switch (message.type) {
-      case "info":
-      case "ok":
-        window[message.type].apply(window, message.args);
-        break;
-      case "done":
-        continueToNextStepSync();
-        break;
-      default:
-        throw "unknown message";
-    }
-  });
+      let iframe = document.createElement("iframe");
+      iframe.setAttribute("mozbrowser", "");
+      iframe.setAttribute("mozapp", manifestURL);
+      iframe.setAttribute("src", srcURL);
+      iframe.setAttribute("remote", remote_app);
+      iframe.addEventListener("mozbrowsershowmodalprompt", function(event) {
+        let message = JSON.parse(event.detail.message);
+        switch (message.type) {
+          case "info":
+          case "ok":
+            window[message.type].apply(window, message.args);
+            break;
+          case "done":
+            continueToNextStepSync();
+            break;
+          default:
+            throw "unknown message";
+        }
+      });
 
-  info("loading app frame");
+      info("loading app frame");
 
-  document.body.appendChild(iframe);
-  yield;
+      document.body.appendChild(iframe);
+      yield;
 
-  request = indexedDB.open(window.location.pathname, 1);
-  request.onerror = errorHandler;
-  request.onupgradeneeded = unexpectedSuccessHandler;
-  request.onsuccess = grabEventAndContinueHandler;
-  event = yield;
+      request = indexedDB.open(window.location.pathname, 1);
+      request.onerror = errorHandler;
+      request.onupgradeneeded = unexpectedSuccessHandler;
+      request.onsuccess = grabEventAndContinueHandler;
+      event = yield;
 
-  db = event.target.result;
-  db.onerror = errorHandler;
+      db = event.target.result;
+      db.onerror = errorHandler;
 
-  objectStore =
-    db.transaction(objectStoreName).objectStore(objectStoreName);
-  objectStore.get(testKey).onsuccess = grabEventAndContinueHandler;
-  event = yield;
+      objectStore =
+        db.transaction(objectStoreName).objectStore(objectStoreName);
+      objectStore.get(testKey).onsuccess = grabEventAndContinueHandler;
+      event = yield;
 
-  ok(testValue == event.target.result, "data still exists");
+      ok(testValue == event.target.result, "data still exists");
 
-  finishTest();
-  yield;
-}
+      finishTest();
+      yield;
+    }
 
-function start()
-{
-  if (!SpecialPowers.isMainProcess()) {
-    todo(false, "Test disabled in child processes, for now");
-    SimpleTest.finish();
-    return;
-  }
+    function start()
+    {
+      if (!SpecialPowers.isMainProcess()) {
+        todo(false, "Test disabled in child processes, for now");
+        SimpleTest.finish();
+        return;
+      }
 
-  SpecialPowers.addPermission("browser", true, document);
-  SpecialPowers.addPermission("browser", true, { manifestURL: manifestURL,
-                                                 isInBrowserElement: false });
-  SpecialPowers.addPermission("embed-apps", true, document);
+      SpecialPowers.addPermission("browser", true, document);
+      SpecialPowers.addPermission("browser", true, { manifestURL: manifestURL,
+                                                     isInBrowserElement: false });
+      SpecialPowers.addPermission("embed-apps", true, document);
 
-  let Webapps = {};
-  SpecialPowers.wrap(Components)
-               .utils.import("resource://gre/modules/Webapps.jsm", Webapps);
-  let appRegistry = SpecialPowers.wrap(Webapps.DOMApplicationRegistry);
+      let Webapps = {};
+      SpecialPowers.wrap(Components)
+                   .utils.import("resource://gre/modules/Webapps.jsm", Webapps);
+      let appRegistry = SpecialPowers.wrap(Webapps.DOMApplicationRegistry);
 
-  let originalAllAppsLaunchable = appRegistry.allAppsLaunchable;
-  appRegistry.allAppsLaunchable = true;
+      let originalAllAppsLaunchable = appRegistry.allAppsLaunchable;
+      appRegistry.allAppsLaunchable = true;
 
-  window.addEventListener("unload", function cleanup(event) {
-    if (event.target == document) {
-      window.removeEventListener("unload", cleanup, false);
+      window.addEventListener("unload", function cleanup(event) {
+        if (event.target == document) {
+          window.removeEventListener("unload", cleanup, false);
 
-      SpecialPowers.removePermission("browser", location.href);
-      SpecialPowers.removePermission("browser",
-                                     location.protocol + "//" + appDomain);
-      SpecialPowers.removePermission("embed-apps", location.href);
-      appRegistry.allAppsLaunchable = originalAllAppsLaunchable;
+          SpecialPowers.removePermission("browser", location.href);
+          SpecialPowers.removePermission("browser",
+                                         location.protocol + "//" + appDomain);
+          SpecialPowers.removePermission("embed-apps", location.href);
+          appRegistry.allAppsLaunchable = originalAllAppsLaunchable;
+        }
+      }, false);
+
+      SpecialPowers.pushPrefEnv({
+        "set": [["dom.mozBrowserFramesEnabled", true]]
+      }, runTest);
     }
-  }, false);
-
-  SpecialPowers.pushPrefEnv({
-    "set": [["dom.mozBrowserFramesEnabled", true]]
-  }, runTest);
-}