Reland cros: Test for overlapping ContinueSessionRestore calls

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
@@ skipping 210 matching lines @@
   return static_cast<WebUILoginDisplay*>(
       controller->login_display());
 }
 
 void OobeBaseTest::WaitForGaiaPageLoad() {
   WaitForSigninScreen();
   WaitForGaiaPageReload();
 }
 
 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;
 
-  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));
   } while (message != "\"GaiaReady\"");
 }
 
 void OobeBaseTest::WaitForSigninScreen() {
   WizardController* wizard_controller = WizardController::default_controller();
   if (wizard_controller)
     wizard_controller->SkipToLoginForTesting(LoginScreenContext());
@@ skipping 16 matching lines @@
       "document.getElementById('$FieldId').value = '$FieldValue';"
       "var e = new Event('input');"
       "document.getElementById('$FieldId').dispatchEvent(e);"
       "})();";
   base::ReplaceSubstringsAfterOffset(&js, 0, "$FieldId", field_id);
   base::ReplaceSubstringsAfterOffset(&js, 0, "$FieldValue", field_value);
   ExecuteJsInSigninFrame(js);
 }
 
 }  // namespace chromeos