Move the check to detect first login before adding the User to the UserManager

chrome/browser/chromeos/login/login_utils.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/chromeos/login/login_utils.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 151 matching lines @@
   // Check user's profile for kApplicationLocale setting.
   void RespectLocalePreference(Profile* pref);
 
   // The current background view.
   chromeos::BackgroundView* background_view_;
 
   std::string username_;
   std::string password_;
   GaiaAuthConsumer::ClientLoginResult credentials_;
   bool pending_requests_;
+  bool first_login_;
 
   // Delegate to be fired when the profile will be prepared.
   LoginUtils::Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginUtilsImpl);
 };
 
 class LoginUtilsWrapper {
  public:
   static LoginUtilsWrapper* GetInstance() {
@@ skipping 31 matching lines @@
   BootTimesLoader* btl = BootTimesLoader::Get();
 
   VLOG(1) << "Completing login for " << username;
   btl->AddLoginTimeMarker("CompletingLogin", false);
 
   if (CrosLibrary::Get()->EnsureLoaded()) {
     CrosLibrary::Get()->GetLoginLibrary()->StartSession(username, "");
     btl->AddLoginTimeMarker("StartedSession", false);
   }
 
+  // Record whether this is the first login before we add the user to the
+  // UserManager.
+  first_login_ = !UserManager::Get()->IsKnownUser(username);
+
   UserManager::Get()->UserLoggedIn(username);
   btl->AddLoginTimeMarker("UserLoggedIn", false);
 
   // Switch log file as soon as possible.
   logging::RedirectChromeLogging(*(CommandLine::ForCurrentProcess()));
   btl->AddLoginTimeMarker("LoggingRedirected", false);
 
   username_ = username;
   password_ = password;
   credentials_ = credentials;
   pending_requests_ = pending_requests;
   delegate_ = delegate;
 
   // The default profile will have been changed because the ProfileManager
   // will process the notification that the UserManager sends out.
   ProfileManager::CreateDefaultProfileAsync(this);
 }
 
 void LoginUtilsImpl::OnProfileCreated(Profile* profile) {
   CHECK(profile);
 
   BootTimesLoader* btl = BootTimesLoader::Get();
   btl->AddLoginTimeMarker("UserProfileGotten", false);
 
-  bool first_login = !UserManager::Get()->IsKnownUser(username_);
   // Change the proxy configuration service of the default request context to
   // use the preference configuration from the logged-in profile. This ensures
   // that requests done through the default context use the proxy configuration
   // provided by configuration policy.
   //
   // Note: Many of the clients of the default request context should probably be
   // fixed to use the request context of the profile they are associated with.
   // This includes preconnect, autofill, metrics service to only name a few;
   // see http://code.google.com/p/chromium/issues/detail?id=64339 for details.
   //
@@ skipping 55 matching lines @@
         cryptohome->TpmClearStoredPassword();
       } else {
         cryptohome->TpmCanAttemptOwnership();
       }
     }
   }
   btl->AddLoginTimeMarker("TPMOwned", false);
 
   RespectLocalePreference(profile);
 
-  if (first_login) {
+  if (first_login_) {

[Nikita (slow), 2011/05/20 09:33:46]

Turns out that UserManager has
bool current_user_is_new() const;

which is initialized on UserLoggedIn().
Please remove first_login_ completely and use current_user_is_new() instead.

[Zachary Kuznia, 2011/05/23 08:06:35]

Done.

     SetFirstLoginPrefs(profile->GetPrefs());
   }
 
   // Enable/disable plugins based on user preferences.
   PluginUpdater::GetInstance()->SetProfile(profile);
   btl->AddLoginTimeMarker("PluginsStateUpdated", false);
 
   // We suck. This is a hack since we do not have the enterprise feature
   // done yet to pull down policies from the domain admin. We'll take this
   // out when we get that done properly.
@@ skipping 260 matching lines @@
   // Mark login host for deletion after browser starts.  This
   // guarantees that the message loop will be referenced by the
   // browser before it is dereferenced by the login host.
   if (login_host) {
     login_host->OnSessionStart();
     login_host = NULL;
   }
 }
 
 }  // namespace chromeos