Removed --disable-cloud-policy-on-signin flag.

Also removed the related kDisableCloudPolicyOnSignin pref.

BUG=None

Review URL: https://codereview.chromium.org/26512003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229139 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 0 insertions, 42 deletions

diff --git a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc
index 844bb35..0fb0456 100644
--- a/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc
+++ b/chrome/browser/policy/cloud/user_cloud_policy_manager_factory.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
 
-#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "chrome/browser/policy/cloud/cloud_external_data_manager.h"
@@ -12,7 +11,6 @@
 #include "chrome/browser/policy/cloud/user_cloud_policy_store.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
-#include "components/policy/core/common/policy_switches.h"
 
 namespace policy {
 
@@ -53,10 +51,6 @@ scoped_ptr<UserCloudPolicyManager>
     UserCloudPolicyManagerFactory::CreateManagerForProfile(
         Profile* profile,
         bool force_immediate_load) {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableCloudPolicyOnSignin)) {
-    return scoped_ptr<UserCloudPolicyManager>();
-  }
   scoped_ptr<UserCloudPolicyStore> store(UserCloudPolicyStore::Create(profile));
   if (force_immediate_load)
     store->LoadImmediately();
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service.cc b/chrome/browser/policy/cloud/user_policy_signin_service.cc
index 7075d14..db1349a 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service.cc
+++ b/chrome/browser/policy/cloud/user_policy_signin_service.cc
@@ -7,7 +7,6 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
-#include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/policy/cloud/cloud_policy_client_registration_helper.h"
@@ -17,7 +16,6 @@
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager.h"
-#include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "google_apis/gaia/gaia_constants.h"
@@ -36,9 +34,6 @@ UserPolicySigninService::UserPolicySigninService(
                                   request_context,
                                   device_management_service),
       oauth2_token_service_(token_service) {
-  if (profile->GetPrefs()->GetBoolean(prefs::kDisableCloudPolicyOnSignin))
-    return;
-
   // ProfileOAuth2TokenService should not yet have loaded its tokens since this
   // happens in the background after PKS initialization - so this service
   // should always be created before the oauth token is available.
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_base.cc b/chrome/browser/policy/cloud/user_policy_signin_service_base.cc
index 324d5c1..86127d67 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service_base.cc
+++ b/chrome/browser/policy/cloud/user_policy_signin_service_base.cc
@@ -7,17 +7,14 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
-#include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud/device_management_service.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_source.h"
 #include "net/url_request/url_request_context_getter.h"
 
@@ -33,9 +30,6 @@ UserPolicySigninServiceBase::UserPolicySigninServiceBase(
       request_context_(request_context),
       device_management_service_(device_management_service),
       weak_factory_(this) {
-  if (profile_->GetPrefs()->GetBoolean(prefs::kDisableCloudPolicyOnSignin))
-    return;
-
   // Initialize/shutdown the UserCloudPolicyManager when the user signs out.
   registrar_.Add(this,
                  chrome::NOTIFICATION_GOOGLE_SIGNED_OUT,
@@ -175,9 +169,6 @@ scoped_ptr<CloudPolicyClient> UserPolicySigninServiceBase::PrepareToRegister(
 
 bool UserPolicySigninServiceBase::ShouldLoadPolicyForUser(
     const std::string& username) {
-  if (profile_->GetPrefs()->GetBoolean(prefs::kDisableCloudPolicyOnSignin))
-    return false;  // Cloud policy is disabled.
-
   if (username.empty())
     return false;  // Not signed in.
 
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc b/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc
index 06b0150..de10280 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc
+++ b/chrome/browser/policy/cloud/user_policy_signin_service_factory.cc
@@ -89,10 +89,6 @@ UserPolicySigninServiceFactory::ServiceIsCreatedWithBrowserContext() const {
 
 void UserPolicySigninServiceFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* user_prefs) {
-  user_prefs->RegisterBooleanPref(
-      prefs::kDisableCloudPolicyOnSignin,
-      false,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 #if defined(OS_ANDROID)
   user_prefs->RegisterInt64Pref(
       prefs::kLastPolicyCheckTime,
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc
index 485f42d..7a123da 100644
--- a/chrome/browser/prefs/command_line_pref_store.cc
+++ b/chrome/browser/prefs/command_line_pref_store.cc
@@ -16,10 +16,6 @@
 #include "chrome/common/pref_names.h"
 #include "ui/base/ui_base_switches.h"
 
-#if defined(ENABLE_CONFIGURATION_POLICY)
-#include "components/policy/core/common/policy_switches.h"
-#endif
-
 #if defined(OS_CHROMEOS)
 #include "chromeos/chromeos_switches.h"
 #endif
@@ -74,10 +70,6 @@ const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry
       { chromeos::switches::kEnableTouchpadThreeFingerClick,
           prefs::kEnableTouchpadThreeFingerClick, true },
 #endif
-#if defined(ENABLE_CONFIGURATION_POLICY)
-      { policy::switches::kDisableCloudPolicyOnSignin,
-          prefs::kDisableCloudPolicyOnSignin, true },
-#endif
       { switches::kDisableAsyncDns, prefs::kBuiltInDnsClientEnabled, false },
       { switches::kEnableAsyncDns, prefs::kBuiltInDnsClientEnabled, true },
 };
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 92534d1..e74a04a 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -2208,10 +2208,6 @@ const char kPerformanceTracingEnabled[] =
 // Value of the enums in TabStrip::LayoutType as an int.
 const char kTabStripLayoutType[] = "tab_strip_layout_type";
 
-// If true, cloud policy for the user is not loaded when the user signs in.
-const char kDisableCloudPolicyOnSignin[] =
-    "policy.disable_cloud_policy_on_signin";
-
 // Indicates that factory reset was requested from options page.
 const char kFactoryResetRequested[] = "FactoryResetRequested";
 
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 27664c6..c51a948 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -832,7 +832,6 @@ extern const char kHardwareAccelerationModePrevious[];
 
 extern const char kDevicePolicyRefreshRate[];
 extern const char kUserPolicyRefreshRate[];
-extern const char kDisableCloudPolicyOnSignin[];
 
 extern const char kFactoryResetRequested[];
 
diff --git a/components/policy/core/common/policy_switches.cc b/components/policy/core/common/policy_switches.cc
index 343bdef..a55ea6a 100644
--- a/components/policy/core/common/policy_switches.cc
+++ b/components/policy/core/common/policy_switches.cc
@@ -13,10 +13,6 @@ namespace switches {
 // policy which affects many users is changed.
 const char kCloudPolicyInvalidationDelay[]  = "cloud-policy-invalidation-delay";
 
-// If present, disables the loading and application of cloud policy for
-// signed-in users.
-const char kDisableCloudPolicyOnSignin[]    = "disable-cloud-policy-on-signin";
-
 // Disables pushing cloud policy to Chrome using an invalidation service.
 const char kDisableCloudPolicyPush[]        = "disable-cloud-policy-push";
 
diff --git a/components/policy/core/common/policy_switches.h b/components/policy/core/common/policy_switches.h
index 039b7d5..d8fb06d74 100644
--- a/components/policy/core/common/policy_switches.h
+++ b/components/policy/core/common/policy_switches.h
@@ -13,7 +13,6 @@ namespace policy {
 namespace switches {
 
 POLICY_EXPORT extern const char kCloudPolicyInvalidationDelay[];
-POLICY_EXPORT extern const char kDisableCloudPolicyOnSignin[];
 POLICY_EXPORT extern const char kDisableCloudPolicyPush[];
 
 #if defined(OS_ANDROID) || defined(OS_IOS)