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

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

Issue 1123783002: Add ExecuteJavaScriptForTest and make all tests use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android Created 5 years, 5 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 "ash/system/chromeos/devicetype_utils.h" 7 #include "ash/system/chromeos/devicetype_utils.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/guid.h" 9 #include "base/guid.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 web_ui()->GetWebContents(), 754 web_ui()->GetWebContents(),
755 GURL(kAuthIframeParentOrigin), 755 GURL(kAuthIframeParentOrigin),
756 kAuthIframeParentName); 756 kAuthIframeParentName);
757 757
758 if (!StartupUtils::IsWebviewSigninEnabled()) { 758 if (!StartupUtils::IsWebviewSigninEnabled()) {
759 std::string code; 759 std::string code;
760 code += "document.getElementById('Email').value = '" + test_user_ + "';"; 760 code += "document.getElementById('Email').value = '" + test_user_ + "';";
761 code += "document.getElementById('Passwd').value = '" + test_pass_ + "';"; 761 code += "document.getElementById('Passwd').value = '" + test_pass_ + "';";
762 code += "document.getElementById('signIn').click();"; 762 code += "document.getElementById('signIn').click();";
763 763
764 frame->ExecuteJavaScript(base::ASCIIToUTF16(code)); 764 frame->ExecuteJavaScriptForTests(base::ASCIIToUTF16(code));
765 } else { 765 } else {
766 std::string code; 766 std::string code;
767 767
768 code = 768 code =
769 "document.getElementById('identifier').value = '" + test_user_ + "';"; 769 "document.getElementById('identifier').value = '" + test_user_ + "';";
770 code += "document.getElementById('nextButton').click();"; 770 code += "document.getElementById('nextButton').click();";
771 frame->ExecuteJavaScript(base::ASCIIToUTF16(code)); 771 frame->ExecuteJavaScriptForTests(base::ASCIIToUTF16(code));
772 772
773 if (!test_pass_.empty()) { 773 if (!test_pass_.empty()) {
774 code = 774 code =
775 "document.getElementById('password').value = '" + test_pass_ + "';"; 775 "document.getElementById('password').value = '" + test_pass_ + "';";
776 code += "document.getElementById('nextButton').click();"; 776 code += "document.getElementById('nextButton').click();";
777 frame->ExecuteJavaScript(base::ASCIIToUTF16(code)); 777 frame->ExecuteJavaScriptForTests(base::ASCIIToUTF16(code));
778 } 778 }
779 } 779 }
780 780
781 // Test properties are cleared in HandleCompleteLogin because the form 781 // Test properties are cleared in HandleCompleteLogin because the form
782 // submission might fail and login will not be attempted after reloading 782 // submission might fail and login will not be attempted after reloading
783 // if they are cleared here. 783 // if they are cleared here.
784 } 784 }
785 785
786 void GaiaScreenHandler::SetSAMLPrincipalsAPIUsed(bool api_used) { 786 void GaiaScreenHandler::SetSAMLPrincipalsAPIUsed(bool api_used) {
787 using_saml_api_ = api_used; 787 using_saml_api_ = api_used;
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { 946 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
947 DCHECK(signin_screen_handler_); 947 DCHECK(signin_screen_handler_);
948 return signin_screen_handler_->delegate_; 948 return signin_screen_handler_->delegate_;
949 } 949 }
950 950
951 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { 951 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {
952 signin_screen_handler_ = handler; 952 signin_screen_handler_ = handler;
953 } 953 }
954 954
955 } // namespace chromeos 955 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698