Bug 604201 - browser_tabview_snapping.js test fails if you run it by itself [r=ian, a=better-test!]

browser/base/content/test/tabview/browser_tabview_snapping.js

@@ -38,20 +38,16 @@
 function test() {
   waitForExplicitFinish();
 
-  window.addEventListener("tabviewshown", onTabViewWindowLoaded, false);
-  if (TabView.isVisible())
-    onTabViewWindowLoaded();
-  else
-    TabView.show();
+	newWindowWithTabView(onTabViewWindowLoaded);
 }
 
-function onTabViewWindowLoaded() {
-  window.removeEventListener("tabviewshown", onTabViewWindowLoaded, false);
+function onTabViewWindowLoaded(win) {
+  win.removeEventListener("tabviewshown", onTabViewWindowLoaded, false);
 
-  let contentWindow = document.getElementById("tab-view").contentWindow;
-  let [originalTab] = gBrowser.visibleTabs;
+  let contentWindow = win.document.getElementById("tab-view").contentWindow;
+  let [originalTab] = win.gBrowser.visibleTabs;
 
-  ok(TabView.isVisible(), "Tab View is visible");
+  ok(win.TabView.isVisible(), "Tab View is visible");
   is(contentWindow.GroupItems.groupItems.length, 1, "There is only one group");
   let currentActiveGroup = contentWindow.GroupItems.getActiveGroupItem();
 
@@ -79,17 +75,10 @@ function onTabViewWindowLoaded() {
     firstGroup.close();
     thirdGroup.container.parentNode.removeChild(thirdGroup.container);
     thirdGroup.close();
-    let onTabViewHidden = function() {
-      window.removeEventListener("tabviewhidden", onTabViewHidden, false);
-      ok(!TabView.isVisible(), "TabView is shown");
-      finish();
-    };
-    window.addEventListener("tabviewhidden", onTabViewHidden, false);
 
-    ok(TabView.isVisible(), "TabView is shown");
-    
-    gBrowser.selectedTab = originalTab;
-    TabView.hide();
+		win.close();
+    ok(win.closed, "new window is closed");
+    finish();
   }
   
   let continueWithPart2 = function() {
@@ -201,3 +190,19 @@ function checkSnap(item, offsetX, offsetY, contentWindow, callback) {
   item.container.addEventListener('drop', onDrop, false);
   simulateDragDrop(item, offsetX, offsetY, contentWindow);
 }
+
+function newWindowWithTabView(callback) {
+  let charsetArg = "charset=" + window.content.document.characterSet;
+  let win = window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no,height=800,width=1000",
+                              "about:blank", charsetArg, null, null, true);
+  let onLoad = function() {
+    win.removeEventListener("load", onLoad, false);
+    let onShown = function() {
+      win.removeEventListener("tabviewshown", onShown, false);
+      callback(win);
+    };
+    win.addEventListener("tabviewshown", onShown, false);
+    win.TabView.toggle();
+  }
+  win.addEventListener("load", onLoad, false);
+}