Reverting this as it causes browser tests on the Linux ChromiumOS builder to fail.

chrome/browser/policy/cloud_policy_provider.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/cloud_policy_provider.h"
 
-#include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/policy_bundle.h"
 #include "chrome/browser/policy/policy_map.h"
-#include "chrome/common/chrome_switches.h"
 
 namespace policy {
 
 CloudPolicyProvider::CloudPolicyProvider(
     BrowserPolicyConnector* browser_policy_connector,
     PolicyLevel level)
     : browser_policy_connector_(browser_policy_connector),
       level_(level),
       initialization_complete_(false) {
   for (size_t i = 0; i < CACHE_SIZE; ++i)
@@ skipping 55 matching lines @@
     }
   }
   NOTREACHED();
 }
 
 void CloudPolicyProvider::Merge() {
   // Re-check whether all caches are ready.
   if (!initialization_complete_) {
     initialization_complete_ = true;
     for (size_t i = 0; i < CACHE_SIZE; ++i) {
-#if defined(OS_CHROMEOS)
-      // Ignore the device policy cache if device policy is not enabled.
-      if (i == CACHE_DEVICE &&
-          !CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kEnableDevicePolicy)) {
-        continue;
-      }
-#endif
       if (caches_[i] == NULL || !caches_[i]->IsReady()) {
         initialization_complete_ = false;
         break;
       }
     }
   }
 
   PolicyMap combined;
   for (size_t i = 0; i < CACHE_SIZE; ++i) {
     if (caches_[i] && caches_[i]->IsReady())
       combined.MergeFrom(*caches_[i]->policy());
   }
   combined.FilterLevel(level_);
 
   scoped_ptr<PolicyBundle> bundle(new PolicyBundle());
   bundle->Get(POLICY_DOMAIN_CHROME, std::string()).Swap(&combined);
   UpdatePolicy(bundle.Pass());
 }
 
 }  // namespace policy