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..9b125fabe291dd04e67ba5e2cbe1e2c11ff0ea59 100644
--- a/chrome/browser/chromeos/login/test/oobe_base_test.cc
+++ b/chrome/browser/chromeos/login/test/oobe_base_test.cc
@@ -228,16 +228,19 @@ 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');"
-          "});");
-
   content::DOMMessageQueue message_queue;

[achuithb, 2017/02/02 00:37:11]

A comment might be useful in case someone decides to move this below closer to
where it's used in a later refactoring.

[xiyuan, 2017/02/02 18:43:59]

Done.

+
+  JS().Evaluate(
+      "(function() {"
+      "  var authenticator = $('gaia-signin').gaiaAuthHost_;"
+      "  var f = function() {"

[achuithb, 2017/02/02 00:37:11]

This doesn't make a functional difference, right?

[xiyuan, 2017/02/02 18:43:59]

No functional change in PS4. PS3 was too aggressive and breaks a few tests that
needs more time to trigger a Gaia reload.

+      "    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));