Remove the --enable-device-policy and --enable-onc-policy flags.

chrome/browser/policy/browser_policy_connector.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/policy/browser_policy_connector.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 512 matching lines @@
   }
 }
 
 void BrowserPolicyConnector::InitializeDevicePolicy() {
 #if defined(OS_CHROMEOS)
   // Throw away the old backend.
   device_cloud_policy_subsystem_.reset();
   device_data_store_.reset();
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kEnableDevicePolicy)) {
-    if (command_line->HasSwitch(switches::kEnableCloudPolicyService)) {
-      // TODO(mnissler): Initialize new-style device policy here once it's
-      // implemented.
-    } else {
-      device_data_store_.reset(CloudPolicyDataStore::CreateForDevicePolicies());
-      chromeos::CryptohomeLibrary* cryptohome =
-          chromeos::CrosLibrary::Get()->GetCryptohomeLibrary();
-      install_attributes_.reset(new EnterpriseInstallAttributes(cryptohome));
-      DevicePolicyCache* device_policy_cache =
-          new DevicePolicyCache(device_data_store_.get(),
-                                install_attributes_.get());
+  if (command_line->HasSwitch(switches::kEnableCloudPolicyService)) {
+    // TODO(mnissler): Initialize new-style device policy here once it's
+    // implemented.
+  } else {
+    device_data_store_.reset(CloudPolicyDataStore::CreateForDevicePolicies());
+    chromeos::CryptohomeLibrary* cryptohome =
+        chromeos::CrosLibrary::Get()->GetCryptohomeLibrary();
+    install_attributes_.reset(new EnterpriseInstallAttributes(cryptohome));
+    DevicePolicyCache* device_policy_cache =
+        new DevicePolicyCache(device_data_store_.get(),
+                              install_attributes_.get());
 
-      managed_cloud_provider_->SetDevicePolicyCache(device_policy_cache);
-      recommended_cloud_provider_->SetDevicePolicyCache(device_policy_cache);
+    managed_cloud_provider_->SetDevicePolicyCache(device_policy_cache);
+    recommended_cloud_provider_->SetDevicePolicyCache(device_policy_cache);
 
-      device_cloud_policy_subsystem_.reset(new CloudPolicySubsystem(
-          device_data_store_.get(),
-          device_policy_cache,
-          GetDeviceManagementUrl()));
-    }
+    device_cloud_policy_subsystem_.reset(new CloudPolicySubsystem(
+        device_data_store_.get(),
+        device_policy_cache,
+        GetDeviceManagementUrl()));
   }
 #endif
 }
 
 void BrowserPolicyConnector::CompleteInitialization() {
 #if defined(OS_CHROMEOS)
 
   // Create the AppPackUpdater to start updating the cache. It requires the
   // system request context, which isn't available in Init(); therefore it is
   // created only once the loops are running.
@@ skipping 78 matching lines @@
     return new AsyncPolicyProvider(loader.Pass());
   } else {
     return NULL;
   }
 #else
   return NULL;
 #endif
 }
 
 }  // namespace policy