| Index: chrome/browser/managed_mode/managed_user_service.h
|
| diff --git a/chrome/browser/managed_mode/managed_user_service.h b/chrome/browser/managed_mode/managed_user_service.h
|
| index b2d05f6655c4deed61aa4d82431dcba2696b28d2..baf790cb80aefb2a97cd95c0ff87d72959adc57e 100644
|
| --- a/chrome/browser/managed_mode/managed_user_service.h
|
| +++ b/chrome/browser/managed_mode/managed_user_service.h
|
| @@ -116,9 +116,6 @@ class ManagedUserService : public BrowserContextKeyedService,
|
| // 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);
|
| @@ -144,8 +141,6 @@ class ManagedUserService : public BrowserContextKeyedService,
|
| 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,
|
| @@ -165,7 +160,7 @@ class ManagedUserService : public BrowserContextKeyedService,
|
| virtual void OnBrowserSetLastActive(Browser* browser) OVERRIDE;
|
|
|
| private:
|
| - friend class ManagedUserServiceExtensionTest;
|
| + friend class ManagedUserServiceExtensionTestBase;
|
| friend class ManagedUserServiceFactory;
|
| FRIEND_TEST_ALL_PREFIXES(ManagedUserServiceTest,
|
| ExtensionManagementPolicyProviderUnmanaged);
|
| @@ -259,8 +254,6 @@ class ManagedUserService : public BrowserContextKeyedService,
|
| 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.
|
|
|