Index: chrome/test/base/testing_profile.h |
diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h |
index 244ba79f39121c90026eef6f1961098abc50f8b5..6826fdc2384435d2fa7b6932d53a38b8fc99f6ab 100644 |
--- a/chrome/test/base/testing_profile.h |
+++ b/chrome/test/base/testing_profile.h |
@@ -84,10 +84,6 @@ class TestingProfile : public Profile { |
// Sets the PrefService to be used by this profile. |
void SetPrefService(scoped_ptr<PrefService> prefs); |
- // Sets the UserCloudPolicyManager to be used by this profile. |
- void SetUserCloudPolicyManager( |
- scoped_ptr<policy::UserCloudPolicyManager> manager); |
- |
// Creates the TestingProfile using previously-set settings. |
scoped_ptr<TestingProfile> Build(); |
@@ -96,7 +92,6 @@ class TestingProfile : public Profile { |
bool build_called_; |
// Various staging variables where values are held until Build() is invoked. |
- scoped_ptr<policy::UserCloudPolicyManager> user_cloud_policy_manager_; |
scoped_ptr<PrefService> pref_service_; |
scoped_refptr<ExtensionSpecialStoragePolicy> extension_policy_; |
FilePath path_; |
@@ -123,8 +118,7 @@ class TestingProfile : public Profile { |
TestingProfile(const FilePath& path, |
Delegate* delegate, |
scoped_refptr<ExtensionSpecialStoragePolicy> extension_policy, |
- scoped_ptr<PrefService> prefs, |
- scoped_ptr<policy::UserCloudPolicyManager> manager); |
+ scoped_ptr<PrefService> prefs); |
virtual ~TestingProfile(); |
@@ -220,7 +214,6 @@ class TestingProfile : public Profile { |
// for more information. |
net::CookieMonster* GetCookieMonster(); |
- virtual policy::UserCloudPolicyManager* GetUserCloudPolicyManager() OVERRIDE; |
virtual policy::ManagedModePolicyProvider* |
GetManagedModePolicyProvider() OVERRIDE; |
virtual policy::PolicyService* GetPolicyService() OVERRIDE; |
@@ -351,9 +344,6 @@ class TestingProfile : public Profile { |
// The proxy prefs tracker. |
scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; |
- // UserCloudPolicyManager returned by GetUserCloudPolicyManager(). |
- scoped_ptr<policy::UserCloudPolicyManager> user_cloud_policy_manager_; |
- |
// We use a temporary directory to store testing profile data. In a multi- |
// profile environment, this is invalid and the directory is managed by the |
// TestingProfileManager. |