One AXObjectCache per frame

chrome/test/data/extensions/api_test/automation/tests/tabs/events.js

Index: chrome/test/data/extensions/api_test/automation/tests/tabs/events.js
diff --git a/chrome/test/data/extensions/api_test/automation/tests/tabs/events.js b/chrome/test/data/extensions/api_test/automation/tests/tabs/events.js
index 1d6a92e2a1bb09a27d718b8889053c7919c9ed04..fd2bb2e1faf8699fb4256637a61c66012fda4c50 100644
--- a/chrome/test/data/extensions/api_test/automation/tests/tabs/events.js
+++ b/chrome/test/data/extensions/api_test/automation/tests/tabs/events.js
@@ -25,12 +25,13 @@ var allTests = [
       cancelButton.removeEventListener(EventType.focus, onFocusBubble);
     });
     rootNode.addEventListener(EventType.focus,
-                               function onFocusBubbleRoot(event) {
-      assertEq('focus', event.type);
-      assertEq(cancelButton, event.target);
-      assertTrue(cancelButtonGotEvent);
-      rootNode.removeEventListener(EventType.focus, onFocusBubbleRoot);
-      chrome.test.succeed();
+                              function onFocusBubbleRoot(event) {
+      if (cancelButtonGotEvent) {
+        assertEq('focus', event.type);
+        assertEq(cancelButton, event.target);
+        rootNode.removeEventListener(EventType.focus, onFocusBubbleRoot);
+        chrome.test.succeed();
+      }
     });
     cancelButton.focus();
   },
@@ -38,8 +39,10 @@ var allTests = [
     var cancelButton = rootNode.firstChild.children[2];
     assertEq('Cancel', cancelButton.name);
     function onFocusStopPropRoot(event) {
-      rootNode.removeEventListener(EventType.focus, onFocusStopPropRoot);
-      chrome.test.fail("Focus event was propagated to root");
+      if (event.target == cancelButton) {
+        rootNode.removeEventListener(EventType.focus, onFocusStopPropRoot);
+        chrome.test.fail("Focus event was propagated to root");
+      }
     };
     cancelButton.addEventListener(EventType.focus,
                                   function onFocusStopProp(event) {
@@ -65,13 +68,14 @@ var allTests = [
     cancelButton.addEventListener(EventType.focus, onFocusCapture);
     rootNode.addEventListener(EventType.focus,
                                function onFocusCaptureRoot(event) {
-      assertEq('focus', event.type);
-      assertEq(cancelButton, event.target);
-      assertFalse(cancelButtonGotEvent);
-      event.stopPropagation();
-      rootNode.removeEventListener(EventType.focus, onFocusCaptureRoot);
-      rootNode.removeEventListener(EventType.focus, onFocusCapture);
-      window.setTimeout(chrome.test.succeed.bind(this), 0);
+      if (event.target == cancelButton) {
+        assertEq('focus', event.type);
+        assertFalse(cancelButtonGotEvent);
+        event.stopPropagation();
+        rootNode.removeEventListener(EventType.focus, onFocusCaptureRoot);
+        rootNode.removeEventListener(EventType.focus, onFocusCapture);
+        window.setTimeout(chrome.test.succeed.bind(this), 0);
+      }
     }, true);
     cancelButton.focus();
   }