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

chrome/browser/managed_mode/managed_user_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SERVICE_H_
 #define CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SERVICE_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 98 matching lines @@
   ManualBehavior GetManualBehaviorForURL(const GURL& url);
 
   // Returns all URLS on the given host that have exceptions.
   void GetManualExceptionsForHost(const std::string& host,
                                   std::vector<GURL>* urls);
 
   // Initializes this object. This method does nothing if the profile is not
   // managed.
   void Init();
 
-  // Marks the profile as managed and initializes it.
-  void InitForTesting();
-
   // Initializes this profile for syncing, using the provided |refresh_token| to
   // mint access tokens for Sync.
   void InitSync(const std::string& refresh_token);
 
   // Convenience method that registers this managed user using
   // |registration_utility| and initializes sync with the returned token.
   // The |callback| will be called when registration is complete,
   // whether it suceeded or not -- unless registration was cancelled manually,
   // in which case the callback will be ignored.
   void RegisterAndInitSync(ManagedUserRegistrationUtility* registration_utility,
                            Profile* custodian_profile,
                            const std::string& managed_user_id,
                            const AuthErrorCallback& callback);
 
   // Returns a pseudo-email address for systems that expect well-formed email
   // addresses (like Sync), even though we're not signed in.
   static const char* GetManagedUserPseudoEmail();
 
   void set_elevated_for_testing(bool skip) {
     elevated_for_testing_ = skip;
   }
 
   void AddNavigationBlockedCallback(const NavigationBlockedCallback& callback);
   void DidBlockNavigation(content::WebContents* web_contents);
 
-  void AddInitCallback(const base::Closure& callback);
-
   // extensions::ManagementPolicy::Provider implementation:
   virtual std::string GetDebugPolicyProviderName() const OVERRIDE;
   virtual bool UserMayLoad(const extensions::Extension* extension,
                            string16* error) const OVERRIDE;
   virtual bool UserMayModifySettings(const extensions::Extension* extension,
                                      string16* error) const OVERRIDE;
 
   // ProfileSyncServiceObserver implementation:
   virtual void OnStateChanged() OVERRIDE;
 
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // chrome::BrowserListObserver implementation:
   virtual void OnBrowserSetLastActive(Browser* browser) OVERRIDE;
 
  private:
-  friend class ManagedUserServiceExtensionTest;
+  friend class ManagedUserServiceExtensionTestBase;
   friend class ManagedUserServiceFactory;
   FRIEND_TEST_ALL_PREFIXES(ManagedUserServiceTest,
                            ExtensionManagementPolicyProviderUnmanaged);
   FRIEND_TEST_ALL_PREFIXES(ManagedUserServiceTest,
                            ExtensionManagementPolicyProviderManaged);
 
   // A bridge from ManagedMode (which lives on the UI thread) to the
   // ManagedModeURLFilters, one of which lives on the IO thread. This class
   // mediates access to them and makes sure they are kept in sync.
   class URLFilterContext {
@@ skipping 73 matching lines @@
   // Owns us via the BrowserContextKeyedService mechanism.
   Profile* profile_;
 
   content::NotificationRegistrar registrar_;
   PrefChangeRegistrar pref_change_registrar_;
 
   // True iff we're waiting for the Sync service to be initialized.
   bool waiting_for_sync_initialization_;
   bool is_profile_active_;
 
-  std::vector<base::Closure> init_callbacks_;
-
   std::vector<NavigationBlockedCallback> navigation_blocked_callbacks_;
 
   // Sets a profile in elevated state for testing if set to true.
   bool elevated_for_testing_;
 
   // True only when |Shutdown()| method has been called.
   bool did_shutdown_;
 
   URLFilterContext url_filter_context_;
 };
 
 #endif  // CHROME_BROWSER_MANAGED_MODE_MANAGED_USER_SERVICE_H_