Reland cros: Test for overlapping ContinueSessionRestore calls

chrome/browser/chromeos/login/test/oobe_base_test.cc

Index: chrome/browser/chromeos/login/test/oobe_base_test.cc
diff --git a/chrome/browser/chromeos/login/test/oobe_base_test.cc b/chrome/browser/chromeos/login/test/oobe_base_test.cc
index 631c942b9acb1b9bced8b64007bf3af72894c300..7212020bc839aaf37eb6866e7885358052e3ca4d 100644
--- a/chrome/browser/chromeos/login/test/oobe_base_test.cc
+++ b/chrome/browser/chromeos/login/test/oobe_base_test.cc
@@ -228,16 +228,21 @@ void OobeBaseTest::WaitForGaiaPageLoad() {
 }
 
 void OobeBaseTest::WaitForGaiaPageReload() {
-  JS()
-      .Evaluate(
-          "$('gaia-signin').gaiaAuthHost_.addEventListener('ready',"
-          "function f() {"
-          "$(\'gaia-signin\').gaiaAuthHost_.removeEventListener(\'ready\', f);"
-          "window.domAutomationController.setAutomationId(0);"
-          "window.domAutomationController.send('GaiaReady');"
-          "});");
-
+  // Starts listening to message before executing the JS code that generates
+  // the message below.
   content::DOMMessageQueue message_queue;
+
+  JS().Evaluate(
+      "(function() {"
+      "  var authenticator = $('gaia-signin').gaiaAuthHost_;"
+      "  var f = function() {"
+      "    authenticator.removeEventListener('ready', f);"
+      "    window.domAutomationController.setAutomationId(0);"
+      "    window.domAutomationController.send('GaiaReady');"
+      "  };"
+      "  authenticator.addEventListener('ready', f);"
+      "})();");
+
   std::string message;
   do {
     ASSERT_TRUE(message_queue.WaitForMessage(&message));