Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc |
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc |
index 4e3fabe92263d6a3fd0e0fc9df77ec472ac552cb..765e19e2e57f39217df56514a4f446afb7bf3124 100644 |
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc |
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc |
@@ -686,16 +686,33 @@ void GaiaScreenHandler::ShowSigninScreenForCreds(const std::string& username, |
void GaiaScreenHandler::SubmitLoginFormForTest() { |
VLOG(2) << "Submit login form for test, user=" << test_user_; |
- std::string code; |
- code += "document.getElementById('Email').value = '" + test_user_ + "';"; |
- code += "document.getElementById('Passwd').value = '" + test_pass_ + "';"; |
- code += "document.getElementById('signIn').click();"; |
- |
content::RenderFrameHost* frame = InlineLoginUI::GetAuthIframe( |
web_ui()->GetWebContents(), |
GURL(kAuthIframeParentOrigin), |
kAuthIframeParentName); |
- frame->ExecuteJavaScript(base::ASCIIToUTF16(code)); |
+ |
+ if (!StartupUtils::IsWebviewSigninEnabled()) { |
+ std::string code; |
+ code += "document.getElementById('Email').value = '" + test_user_ + "';"; |
+ code += "document.getElementById('Passwd').value = '" + test_pass_ + "';"; |
+ code += "document.getElementById('signIn').click();"; |
+ |
+ frame->ExecuteJavaScript(base::ASCIIToUTF16(code)); |
+ } else { |
+ std::string code; |
+ |
+ code = |
+ "document.getElementById('identifier').value = '" + test_user_ + "';"; |
+ code += "document.getElementById('nextButton').click();"; |
+ frame->ExecuteJavaScript(base::ASCIIToUTF16(code)); |
+ |
+ if (!test_pass_.empty()) { |
+ code = |
+ "document.getElementById('password').value = '" + test_pass_ + "';"; |
+ code += "document.getElementById('nextButton').click();"; |
+ frame->ExecuteJavaScript(base::ASCIIToUTF16(code)); |
+ } |
+ } |
// Test properties are cleared in HandleCompleteLogin because the form |
// submission might fail and login will not be attempted after reloading |