| Index: chrome/browser/chrome_browser_main.cc
|
| ===================================================================
|
| --- chrome/browser/chrome_browser_main.cc (revision 109957)
|
| +++ chrome/browser/chrome_browser_main.cc (working copy)
|
| @@ -548,10 +548,12 @@
|
| parsed_command_line.GetSwitchValueASCII(switches::kLoginUser),
|
| parsed_command_line.GetSwitchValueASCII(switches::kLoginPassword));
|
| } else {
|
| - // We did not log in (we crashed or are debugging), so we need to
|
| - // set the user name for sync.
|
| - profile->GetProfileSyncService(
|
| - chromeos::UserManager::Get()->logged_in_user().email());
|
| + if (!parsed_command_line.HasSwitch(switches::kTestName)) {
|
| + // We did not log in (we crashed or are debugging), so we need to
|
| + // set the user name for sync.
|
| + chromeos::LoginUtils::Get()->RestoreAuthenticationSession(
|
| + chromeos::UserManager::Get()->logged_in_user().email(), profile);
|
| + }
|
| }
|
| }
|
|
|
|
|