Bug 640062 - Panorama tabs-from-other-windows button displays   r=ian

browser/base/content/tabview/search.js

@@ -132,7 +132,7 @@ var TabUtils = {
     // of active Panoramas as well as for windows in which
     // Panorama has yet to be activated. We uses object sniffing to
     // determine the type of tab and then returns its name.     
-    return tab.label != undefined ? tab.label : tab.$tabTitle[0].innerHTML;
+    return tab.label != undefined ? tab.label : tab.$tabTitle[0].textContent;
   },
   
   // ---------

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

@@ -25,8 +25,10 @@ function onTabViewWindowLoaded() {
   window.removeEventListener("tabviewshown", onTabViewWindowLoaded, false);
   ok(TabView.isVisible(), "Tab View is visible");
 
-  let contentWindow = document.getElementById("tab-view").contentWindow;
-  testOne(contentWindow);
+  afterAllTabItemsUpdated(function() { 
+    let contentWindow = document.getElementById("tab-view").contentWindow;
+    testOne(contentWindow);
+  });
 }
 
 function testOne(contentWindow) {