Mark supervised profiles as such immediately when they're created.

chrome/browser/managed_mode/managed_user_service.cc

 // Copyright (c) 2013 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/managed_mode/managed_user_service.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
@@ skipping 275 matching lines @@
 
 void ManagedUserService::DidBlockNavigation(
     content::WebContents* web_contents) {
   for (std::vector<NavigationBlockedCallback>::iterator it =
            navigation_blocked_callbacks_.begin();
        it != navigation_blocked_callbacks_.end(); ++it) {
     it->Run(web_contents);
   }
 }
 
-void ManagedUserService::AddInitCallback(
-    const base::Closure& callback) {
-  init_callbacks_.push_back(callback);
-}
-
 std::string ManagedUserService::GetDebugPolicyProviderName() const {
   // Save the string space in official builds.
 #ifdef NDEBUG
   NOTREACHED();
   return std::string();
 #else
   return "Managed User Service";
 #endif
 }
 
@@ skipping 210 matching lines @@
                                                     std::vector<GURL>* urls) {
   const DictionaryValue* dict =
       profile_->GetPrefs()->GetDictionary(prefs::kManagedModeManualURLs);
   for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
     GURL url(it.key());
     if (url.host() == host)
       urls->push_back(url);
   }
 }
 
-void ManagedUserService::InitForTesting() {
-  DCHECK(!profile_->IsManaged());
-  profile_->GetPrefs()->SetString(prefs::kManagedUserId, "Test ID");
-  Init();
-}
-
 void ManagedUserService::InitSync(const std::string& refresh_token) {
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   // Tell the sync service that setup is in progress so we don't start syncing
   // until we've finished configuration.
   service->SetSetupInProgress(true);
 
   TokenService* token_service = TokenServiceFactory::GetForProfile(profile_);
   token_service->UpdateCredentialsWithOAuth2(
       GaiaAuthConsumer::ClientOAuthResult(refresh_token, std::string(), 0));
@@ skipping 57 matching lines @@
       base::Bind(&ManagedUserService::UpdateManualURLs,
                  base::Unretained(this)));
 
   BrowserList::AddObserver(this);
 
   // Initialize the filter.
   OnDefaultFilteringBehaviorChanged();
   UpdateSiteLists();
   UpdateManualHosts();
   UpdateManualURLs();
-
-  // Call the callbacks to notify that the ManagedUserService has been
-  // initialized.
-  for (std::vector<base::Closure>::iterator it = init_callbacks_.begin();
-       it != init_callbacks_.end();
-       ++it) {
-    it->Run();
-  }
 }
 
 void ManagedUserService::RegisterAndInitSync(
     ManagedUserRegistrationUtility* registration_utility,
     Profile* custodian_profile,
     const std::string& managed_user_id,
     const AuthErrorCallback& callback) {
   DCHECK(ProfileIsManaged());
   DCHECK(!custodian_profile->IsManaged());
 
@@ skipping 86 matching lines @@
       key_prefix,
       base::Int64ToString(base::TimeTicks::Now().ToInternalValue()));
 
   scoped_ptr<DictionaryValue> dict(new DictionaryValue);
 
   // TODO(bauerb): Use sane time when ready.
   dict->SetDouble(kEventTimestamp, base::Time::Now().ToJsTime());
 
   GetSettingsService()->UploadItem(key, dict.PassAs<Value>());
 }