Disable policy push feature by default in Android.

BUG=291251

Review URL: https://chromiumcodereview.appspot.com/24052004

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

chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.cc

@@ -43,10 +43,17 @@ UserCloudPolicyInvalidatorFactory::~UserCloudPolicyInvalidatorFactory() {}
 BrowserContextKeyedService*
     UserCloudPolicyInvalidatorFactory::BuildServiceInstanceFor(
         content::BrowserContext* context) const {
+#if defined(OS_ANDROID)
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kEnableCloudPolicyPush)) {
+    return NULL;
+  }
+#else
   if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableCloudPolicyPush)) {
+        switches::kDisableCloudPolicyPush)) {
     return NULL;
   }
+#endif
 
   Profile* profile = static_cast<Profile*>(context);
 #if defined(OS_CHROMEOS)

chrome/common/chrome_switches.cc

@@ -551,6 +551,9 @@ const char kEnableBatchedShutdown[]         = "enable-batched-shutdown";
 // Enables the benchmarking extensions.
 const char kEnableBenchmarking[]            = "enable-benchmarking";
 
+// Enables pushing cloud policy to Chrome using an invalidation service.
+const char kEnableCloudPolicyPush[]         = "enable-cloud-policy-push";
+
 // This applies only when the process type is "service". Enables the Cloud
 // Print Proxy component within the service process.
 const char kEnableCloudPrintProxy[]         = "enable-cloud-print-proxy";

chrome/common/chrome_switches.h

@@ -165,6 +165,7 @@ extern const char kEnableAuthNegotiatePort[];
 extern const char kEnableAutologin[];
 extern const char kEnableBatchedShutdown[];
 extern const char kEnableBenchmarking[];
+extern const char kEnableCloudPolicyPush[];
 extern const char kEnableCloudPrintProxy[];
 extern const char kEnableComponentCloudPolicy[];
 extern const char kEnableContacts[];