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

chrome/browser/policy/cloud_policy_subsystem.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_subsystem.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 32 matching lines @@
   policy_notifier_->AddObserver(observer);
 }
 
 CloudPolicySubsystem::ObserverRegistrar::~ObserverRegistrar() {
   if (policy_notifier_)
     policy_notifier_->RemoveObserver(observer_);
 }
 
 CloudPolicySubsystem::CloudPolicySubsystem(
     CloudPolicyDataStore* data_store,
-    CloudPolicyCacheBase* policy_cache,
-    const std::string& device_management_url) {
+    CloudPolicyCacheBase* policy_cache) {
+  std::string device_management_url;
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kDeviceManagementUrl)) {
+    device_management_url =
+        command_line->GetSwitchValueASCII(switches::kDeviceManagementUrl);
+  }
   Initialize(data_store, policy_cache, device_management_url);
 }
 
 CloudPolicySubsystem::~CloudPolicySubsystem() {
   cloud_policy_controller_.reset();
   device_token_fetcher_.reset();
   cloud_policy_cache_.reset();
   device_management_service_.reset();
   net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
 }
@@ skipping 136 matching lines @@
 CloudPolicyCacheBase* CloudPolicySubsystem::GetCloudPolicyCacheBase() const {
   return cloud_policy_cache_.get();
 }
 
 CloudPolicySubsystem::CloudPolicySubsystem()
     : refresh_pref_name_(NULL),
       data_store_(NULL) {
 }
 
 }  // namespace policy