cros: Tighten profile loading

chrome/browser/chromeos/system/system_clock.cc

 // Copyright 2015 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/system/system_clock.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 104 matching lines @@
     }
     case chrome::NOTIFICATION_SESSION_STARTED: {
       OnActiveProfileChanged(ProfileManager::GetActiveUserProfile());
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
-void SystemClock::ActiveUserChanged(const user_manager::User* /*user*/) {
-  UpdateClockType();
+void SystemClock::ActiveUserChanged(const user_manager::User* active_user) {
+  if (active_user && active_user->is_profile_created())
+    UpdateClockType();
 }
 
 void SystemClock::AddObserver(SystemClockObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void SystemClock::RemoveObserver(SystemClockObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 void SystemClock::OnActiveProfileChanged(Profile* profile) {
   user_profile_ = profile;
   PrefService* prefs = profile->GetPrefs();
   user_pref_registrar_.reset(new PrefChangeRegistrar);
   user_pref_registrar_->Init(prefs);
   user_pref_registrar_->Add(
       prefs::kUse24HourClock,
       base::Bind(&SystemClock::UpdateClockType, base::Unretained(this)));
+  UpdateClockType();
 }
 
 bool SystemClock::OnProfileDestroyed(Profile* profile) {
   if (profile != user_profile_)
     return false;
   user_pref_registrar_.reset();
   user_profile_ = NULL;
   return true;
 }
 
@@ skipping 57 matching lines @@
   // This also works for enterprise-managed devices because they never have
   // a local owner.
   if (user_manager::UserManager::Get()->IsCurrentUserOwner())
     SetShouldUse24HourClock(ShouldUse24HourClock());
   for (auto& observer : observer_list_)
     observer.OnSystemClockChanged(this);
 }
 
 }  // namespace system
 }  // namespace chromeos