Decouple managed mode code from the policy code in ProfileImpl.

chrome/browser/profiles/profile_impl.h

Index: chrome/browser/profiles/profile_impl.h
diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h
index f0b00790032f292fa3f3e5d42e4d9126702f09af..d5e570bda4e56781bc0c137c7700b9f7e8ae0d76 100644
--- a/chrome/browser/profiles/profile_impl.h
+++ b/chrome/browser/profiles/profile_impl.h
@@ -209,8 +209,10 @@ class ProfileImpl : public Profile {
 #if !defined(OS_CHROMEOS)
   scoped_ptr<policy::UserCloudPolicyManager> cloud_policy_manager_;
 #endif

[Bernhard Bauer, 2013/03/25 10:36:36]

Nit: Could you add comments to the #endif's here? It's getting a bit confusing
with the nesting.

[Joao da Silva, 2013/03/25 10:42:11]

Done. All of this will hopefully go away once |prefs_| is turned into a PKS :-)

+#if defined(ENABLE_MANAGED_USERS)
   scoped_ptr<policy::ManagedModePolicyProvider> managed_mode_policy_provider_;
 #endif
+#endif
   scoped_ptr<policy::PolicyService> policy_service_;
 
   // Keep |prefs_| on top for destruction order because |extension_prefs_|,