| 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 9ab2c5be9fefa0654898d09ff3a63a6826f138aa..f2f8e931c47095e4bd11037364c72563c7cc6c1a 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| @@ -974,6 +974,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;
|
| @@ -1110,7 +1114,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",
|
|
|