Enable cloud policy for extensions by default.

This CL replaces the --enable-component-cloud-policy flag with
--disable-component-cloud-policy, so that the feature is tentatively enabled
by default for M33.

BUG=108992

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

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

4 files changed, 5 insertions, 7 deletions

diff --git a/chrome/browser/policy/cloud/cloud_policy_manager.cc b/chrome/browser/policy/cloud/cloud_policy_manager.cc
index c58809c..6856c09 100644
--- a/chrome/browser/policy/cloud/cloud_policy_manager.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_manager.cc
@@ -110,8 +110,8 @@ void CloudPolicyManager::CreateComponentCloudPolicyService(
   // Called at most once.
   DCHECK(!component_policy_service_);
 
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-           switches::kEnableComponentCloudPolicy) ||
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableComponentCloudPolicy) ||
       policy_cache_path.empty()) {
     return;
   }
diff --git a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
index 19fe5db..7adfe8b 100644
--- a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
@@ -24,7 +24,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "components/policy/core/common/policy_switches.h"
 #include "extensions/common/extension.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "policy/proto/cloud_policy.pb.h"
@@ -106,7 +105,6 @@ class ComponentCloudPolicyTest : public ExtensionBrowserTest {
     std::string url = test_server_.GetServiceURL().spec();
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     command_line->AppendSwitchASCII(::switches::kDeviceManagementUrl, url);
-    command_line->AppendSwitch(switches::kEnableComponentCloudPolicy);
 
     ExtensionBrowserTest::SetUpInProcessBrowserTestFixture();
   }
diff --git a/components/policy/core/common/policy_switches.cc b/components/policy/core/common/policy_switches.cc
index d6491f1..a8cb876 100644
--- a/components/policy/core/common/policy_switches.cc
+++ b/components/policy/core/common/policy_switches.cc
@@ -16,8 +16,8 @@ const char kCloudPolicyInvalidationDelay[]  = "cloud-policy-invalidation-delay";
 // Disables pushing cloud policy to Chrome using an invalidation service.
 const char kDisableCloudPolicyPush[]        = "disable-cloud-policy-push";
 
-// Enables fetching and storing cloud policy for components.
-const char kEnableComponentCloudPolicy[]    = "enable-component-cloud-policy";
+// Disables fetching and storing cloud policy for components.
+const char kDisableComponentCloudPolicy[]    = "disable-component-cloud-policy";
 
 #if defined(OS_ANDROID) || defined(OS_IOS)
 // Registers for cloud policy using the BROWSER client type instead of the
diff --git a/components/policy/core/common/policy_switches.h b/components/policy/core/common/policy_switches.h
index f9ea1cb..b17f880 100644
--- a/components/policy/core/common/policy_switches.h
+++ b/components/policy/core/common/policy_switches.h
@@ -14,7 +14,7 @@ namespace switches {
 
 POLICY_EXPORT extern const char kCloudPolicyInvalidationDelay[];
 POLICY_EXPORT extern const char kDisableCloudPolicyPush[];
-POLICY_EXPORT extern const char kEnableComponentCloudPolicy[];
+POLICY_EXPORT extern const char kDisableComponentCloudPolicy[];
 
 #if defined(OS_ANDROID) || defined(OS_IOS)
 POLICY_EXPORT extern const char kFakeCloudPolicyType[];