Bug 607418 - failure in dom/tests/mochitest/localstorage/test_localStorageOriginsSchemaDiffs.html (only a test update to have more logging), r+a=jst

dom/tests/mochitest/localstorage/frameMasterNotEqual.html

@@ -7,17 +7,55 @@
 
 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;