Speculative fix for BrowserOptionsOverlayWebUITest.testNavigationInBackground

chrome/browser/ui/webui/options/browser_options_browsertest.js

Index: chrome/browser/ui/webui/options/browser_options_browsertest.js
diff --git a/chrome/browser/ui/webui/options/browser_options_browsertest.js b/chrome/browser/ui/webui/options/browser_options_browsertest.js
index c9055dd15c1193a316403a6cfbc517ba5fb76b06..d052975c645ba061eb27a78f018acf88005ee374 100644
--- a/chrome/browser/ui/webui/options/browser_options_browsertest.js
+++ b/chrome/browser/ui/webui/options/browser_options_browsertest.js
@@ -41,12 +41,28 @@ BrowserOptionsOverlayWebUITest.prototype = {
 
   /** @override */
   browsePreload: 'chrome://chrome/settings/autofill',
+
+  /** @override */
+  isAsync: true,
 };
 
 TEST_F('BrowserOptionsOverlayWebUITest', 'testNavigationInBackground',
     function() {
   assertEquals(this.browsePreload, document.location.href);
-  expectTrue($('navigation').classList.contains('background'));
+
+  // Speculative fix for 403627.

[Evan Stade, 2014/08/14 17:10:02]

this comment should read: wait for the message to be posted to the Uber page

[michaelpg, 2014/08/14 23:02:52]

Done.

+  if (!$('navigation').classList.contains('background')) {

[Evan Stade, 2014/08/14 17:10:02]

nit:

if ($('navigation').classList.contains('background')) {
  testDone();
  return;
}

[...]

[michaelpg, 2014/08/14 23:02:52]

Done.

+    window.addEventListener('message', function(e) {
+      if (e.data.method == 'beginInterceptingEvents') {
+        window.setTimeout(function() {
+          assertTrue($('navigation').classList.contains('background'));
+          testDone();
+        });
+      }
+    });
+  } else {
+    testDone();
+  }
 });
 
 /**