Correct ChildAccountService child flag retrieval

chrome/browser/supervised_user/child_accounts/child_account_service.cc

 // Copyright 2014 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/supervised_user/child_accounts/child_account_service.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/field_trial.h"
@@ skipping 85 matching lines @@
 void ChildAccountService::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kChildAccountStatusKnown,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 void ChildAccountService::SetIsChildAccount(bool is_child_account) {
   PropagateChildStatusToUser(is_child_account);
-  if (profile_->IsChild() == is_child_account)
-    return;
+  if (profile_->IsChild() != is_child_account) {
+    if (is_child_account) {
+      profile_->GetPrefs()->SetString(prefs::kSupervisedUserId,
+                                      supervised_users::kChildAccountSUID);
+    } else {
+      profile_->GetPrefs()->ClearPref(prefs::kSupervisedUserId);
+    }
+  }
+  profile_->GetPrefs()->SetBoolean(prefs::kChildAccountStatusKnown, true);
 
-  if (is_child_account) {
-    profile_->GetPrefs()->SetString(prefs::kSupervisedUserId,
-                                    supervised_users::kChildAccountSUID);
-  } else {
-    profile_->GetPrefs()->ClearPref(prefs::kSupervisedUserId);
-  }
+  for (const auto& callback : status_received_callback_list_)
+    callback.Run();
+  status_received_callback_list_.clear();
 }
 
 void ChildAccountService::Init() {
   SigninManagerFactory::GetForProfile(profile_)->AddObserver(this);
   SupervisedUserServiceFactory::GetForProfile(profile_)->SetDelegate(this);
 
   PropagateChildStatusToUser(profile_->IsChild());
 
   // If we're already signed in, fetch the flag again just to be sure.
   // (Previously, the browser might have been closed before we got the flag.
@@ skipping 189 matching lines @@
     ScheduleNextStatusFlagUpdate(flag_fetch_backoff_.GetTimeUntilRelease());
     return;
   }
 
   flag_fetch_backoff_.InformOfRequest(true);
 
   bool is_child_account =
       std::find(flags.begin(), flags.end(),
                 kIsChildAccountServiceFlagName) != flags.end();
 
-  bool status_was_known = profile_->GetPrefs()->GetBoolean(
-      prefs::kChildAccountStatusKnown);
-  profile_->GetPrefs()->SetBoolean(prefs::kChildAccountStatusKnown, true);
-
-  if (!status_was_known) {
-    for (auto& callback : status_received_callback_list_)
-      callback.Run();
-    status_received_callback_list_.clear();
-  }
-
   SetIsChildAccount(is_child_account);
 
   ScheduleNextStatusFlagUpdate(
       base::TimeDelta::FromSeconds(kUpdateIntervalSeconds));
 }
 
 void ChildAccountService::ScheduleNextStatusFlagUpdate(base::TimeDelta delay) {
   flag_fetch_timer_.Start(
       FROM_HERE, delay, this, &ChildAccountService::StartFetchingServiceFlags);
 }
@@ skipping 47 matching lines @@
 }
 
 void ChildAccountService::ClearSecondCustodianPrefs() {
   profile_->GetPrefs()->ClearPref(prefs::kSupervisedUserSecondCustodianName);
   profile_->GetPrefs()->ClearPref(prefs::kSupervisedUserSecondCustodianEmail);
   profile_->GetPrefs()->ClearPref(
       prefs::kSupervisedUserSecondCustodianProfileURL);
   profile_->GetPrefs()->ClearPref(
       prefs::kSupervisedUserSecondCustodianProfileImageURL);
 }