[cros] Display emails of users are stored in a separate dictionary in Local State.

chrome/browser/chrome_browser_main.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 466 matching lines @@
 
   void OnLoginSuccess(const std::string& username,
                       const std::string& password,
                       const GaiaAuthConsumer::ClientLoginResult& credentials,
                       bool pending_requests,
                       bool using_oauth) {
     pending_requests_ = pending_requests;
     if (!profile_prepared_) {
       // Will call OnProfilePrepared in the end.
       chromeos::LoginUtils::Get()->PrepareProfile(username,
+                                                  std::string(),
                                                   password,
                                                   credentials,
                                                   pending_requests,
                                                   using_oauth,
                                                   false,
                                                   this);
     } else if (!pending_requests) {
       delete this;
     }
   }
@@ skipping 34 matching lines @@
     }
     browser::ShowLoginWizard(first_screen, size);
   } else if (parsed_command_line.HasSwitch(switches::kLoginUser) &&
       parsed_command_line.HasSwitch(switches::kLoginPassword)) {
     chromeos::BootTimesLoader::Get()->RecordLoginAttempted();
     new StubLogin(
         parsed_command_line.GetSwitchValueASCII(switches::kLoginUser),
         parsed_command_line.GetSwitchValueASCII(switches::kLoginPassword));
   } else {
     if (!parsed_command_line.HasSwitch(switches::kTestName)) {
       // We did not log in (we crashed or are debugging), so we need to

[Nikita (slow), 2011/12/05 13:13:04]

nit: Please update comment since we're not passing username directly now.

[Ivan Korotkov, 2011/12/05 14:12:48]

Done.

       // set the user name for sync.
-      chromeos::LoginUtils::Get()->RestoreAuthenticationSession(
-          chromeos::UserManager::Get()->logged_in_user().email(), profile);
+      chromeos::LoginUtils::Get()->RestoreAuthenticationSession(profile);
     }
   }
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_MACOSX)
 OSStatus KeychainCallback(SecKeychainEvent keychain_event,
                           SecKeychainCallbackInfo *info, void *context) {
   return noErr;
@@ skipping 1581 matching lines @@
   if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
       (pre_read == "0" || pre_read == "1")) {
     std::string uma_name(name);
     uma_name += "_PreRead";
     uma_name += pre_read == "1" ? "Enabled" : "Disabled";
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }