Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

Issue 1054403002: Basic tests for new webview based signin flow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reuse OobeBaseTest Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 SubmitLoginFormForTest(); 679 SubmitLoginFormForTest();
680 } else if (frame_state() != GaiaScreenHandler::FRAME_STATE_LOADING) { 680 } else if (frame_state() != GaiaScreenHandler::FRAME_STATE_LOADING) {
681 DCHECK(signin_screen_handler_); 681 DCHECK(signin_screen_handler_);
682 signin_screen_handler_->OnShowAddUser(); 682 signin_screen_handler_->OnShowAddUser();
683 } 683 }
684 } 684 }
685 685
686 void GaiaScreenHandler::SubmitLoginFormForTest() { 686 void GaiaScreenHandler::SubmitLoginFormForTest() {
687 VLOG(2) << "Submit login form for test, user=" << test_user_; 687 VLOG(2) << "Submit login form for test, user=" << test_user_;
688 688
689 std::string code;
690 code += "document.getElementById('Email').value = '" + test_user_ + "';";
691 code += "document.getElementById('Passwd').value = '" + test_pass_ + "';";
692 code += "document.getElementById('signIn').click();";
693
694 content::RenderFrameHost* frame = InlineLoginUI::GetAuthIframe( 689 content::RenderFrameHost* frame = InlineLoginUI::GetAuthIframe(
695 web_ui()->GetWebContents(), 690 web_ui()->GetWebContents(),
696 GURL(kAuthIframeParentOrigin), 691 GURL(kAuthIframeParentOrigin),
697 kAuthIframeParentName); 692 kAuthIframeParentName);
698 frame->ExecuteJavaScript(base::ASCIIToUTF16(code)); 693
694 if (!StartupUtils::IsWebviewSigninEnabled()) {
695 std::string code;
696 code += "document.getElementById('Email').value = '" + test_user_ + "';";
697 code += "document.getElementById('Passwd').value = '" + test_pass_ + "';";
698 code += "document.getElementById('signIn').click();";
699
700 frame->ExecuteJavaScript(base::ASCIIToUTF16(code));
701 } else {
702 std::string code;
703
704 code =
705 "document.getElementById('identifier').value = '" + test_user_ + "';";
706 code += "document.getElementById('nextButton').click();";
707 frame->ExecuteJavaScript(base::ASCIIToUTF16(code));
708
709 if (!test_pass_.empty()) {
710 code =
711 "document.getElementById('password').value = '" + test_pass_ + "';";
712 code += "document.getElementById('nextButton').click();";
713 frame->ExecuteJavaScript(base::ASCIIToUTF16(code));
714 }
715 }
699 716
700 // Test properties are cleared in HandleCompleteLogin because the form 717 // Test properties are cleared in HandleCompleteLogin because the form
701 // submission might fail and login will not be attempted after reloading 718 // submission might fail and login will not be attempted after reloading
702 // if they are cleared here. 719 // if they are cleared here.
703 } 720 }
704 721
705 void GaiaScreenHandler::SetSAMLPrincipalsAPIUsed(bool api_used) { 722 void GaiaScreenHandler::SetSAMLPrincipalsAPIUsed(bool api_used) {
706 using_saml_api_ = api_used; 723 using_saml_api_ = api_used;
707 UMA_HISTOGRAM_BOOLEAN("ChromeOS.SAML.APIUsed", api_used); 724 UMA_HISTOGRAM_BOOLEAN("ChromeOS.SAML.APIUsed", api_used);
708 } 725 }
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { 871 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
855 DCHECK(signin_screen_handler_); 872 DCHECK(signin_screen_handler_);
856 return signin_screen_handler_->delegate_; 873 return signin_screen_handler_->delegate_;
857 } 874 }
858 875
859 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { 876 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {
860 signin_screen_handler_ = handler; 877 signin_screen_handler_ = handler;
861 } 878 }
862 879
863 } // namespace chromeos 880 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698