Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc |
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc |
index 68f9f6086631c163d81a22332c1d657e5f19c608..94692ec4729a53d6b4639381f9b9e504a6e9d2a6 100644 |
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc |
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc |
@@ -875,6 +875,10 @@ void SigninScreenHandler::ShowSigninScreenForCreds( |
HandleShowAddUser(NULL); |
} |
+void SigninScreenHandler::SetGaiaOriginForTesting(const std::string& arg) { |
+ gaia_origin_for_test_ = arg; |
+} |
+ |
void SigninScreenHandler::OnBrowsingDataRemoverDone() { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
cookie_remover_ = NULL; |
@@ -1010,7 +1014,10 @@ void SigninScreenHandler::LoadAuthExtension( |
params.Set("localizedStrings", localized_strings); |
} |
- params.SetString("gaiaOrigin", GaiaUrls::GetInstance()->gaia_origin_url()); |
+ std::string gaia_origin = GaiaUrls::GetInstance()->gaia_origin_url(); |
+ if (!gaia_origin_for_test_.empty()) |
+ gaia_origin = gaia_origin_for_test_; |
+ params.SetString("gaiaOrigin", gaia_origin); |
const CommandLine* command_line = CommandLine::ForCurrentProcess(); |
if (command_line->HasSwitch(::switches::kGaiaUrlPath)) { |
params.SetString("gaiaUrlPath", |