Backing out this changeset because it's tickling a JS_Assert. a=me
authorKyle Huey <khuey@kylehuey.com>
Thu, 02 Dec 2010 14:29:27 -0500
changeset 58508 5cacd338d84fa2ac583e4a1725a5d705d6f22391
parent 58506 5f7bc844137b3192c5135969ed18dc3723981d0f (current diff)
parent 58507 1def4d0829577023f9534c593348a384803c8bf0 (diff)
child 58509 03ff7e80545f6713625571dc0442027fe9e193bb
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersme
milestone2.0b8pre
Backing out this changeset because it's tickling a JS_Assert. a=me
--- a/dom/tests/mochitest/localstorage/frameMasterNotEqual.html
+++ b/dom/tests/mochitest/localstorage/frameMasterNotEqual.html
@@ -2,65 +2,27 @@
 <head>
 <title>frame for localStorage test</title>
 
 <script type="text/javascript" src="interOriginFrame.js"></script>
 <script type="text/javascript">
 
 var currentStep = 1;
 
-function setupTestObserver()
-{
-  var __ok = ok;
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  
-  var obsSvc = Components.classes["@mozilla.org/observer-service;1"]
-                .getService(Components.interfaces.nsIObserverService);
-                
-  var __observer = {
-    QueryInterface: function(iid)
-    {
-      if (iid.equals(nsIObserver) ||
-          iid.equals(nsISupports))
-        return this;
-
-      throw Components.results.NS_ERROR_NO_INTERFACE;
-    },
-    
-    observe: function(subject, topic, data)
-    {
-      __ok(true, "Observed: " + topic);
-    }    
-  }
-  
-  obsSvc.addObserver(__observer, "domstorage-flush-timer", false);
-  obsSvc.addObserver(__observer, "cookie-changed", false);
-  obsSvc.addObserver(__observer, "offline-app-removed", false);
-  obsSvc.addObserver(__observer, "private-browsing", false);
-  obsSvc.addObserver(__observer, "perm-changed", false);
-}
-
 function doStep()
 {
   switch (currentStep)
   {
     case 1:
-      setupTestObserver();
       localStorage.setItem("X", "1");
       is(localStorage.getItem("X"), "1", "X is 1 in the master");
       break;
 
     case 3:
       is(localStorage.getItem("X"), "1", "X remains 1 in the master");
-      is(localStorage.getItem("X"), "1", "X remains 1 in the master");
-      is(localStorage.length, 1, "One item in the master");
-      is(localStorage.getItem("X"), "1", "X remains 1 in the master");
-      is(localStorage.length, 1, "One item in the master");
-      is(localStorage.getItem("X"), "1", "X remains 1 in the master");
-
       localStorage.removeItem("X");
       is(localStorage.getItem("X"), null, "X was removed from the master");
       break;
 
     case 5:
       is(localStorage.getItem("Y"), null, "Y null in the master");
       break;