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

chrome/browser/policy/auto_enrollment_client.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/auto_enrollment_client.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/location.h"
@@ skipping 93 matching lines @@
 bool AutoEnrollmentClient::IsDisabled() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   return
       !command_line->HasSwitch(switches::kEnterpriseEnrollmentInitialModulus) &&
       !command_line->HasSwitch(switches::kEnterpriseEnrollmentModulusLimit);
 }
 
 // static
 AutoEnrollmentClient* AutoEnrollmentClient::Create(
     const base::Closure& completion_callback) {
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+
   // The client won't do anything if |service| is NULL.
   DeviceManagementService* service = NULL;
   if (IsDisabled()) {
     VLOG(1) << "Auto-enrollment is disabled";
   } else {
-    std::string url = BrowserPolicyConnector::GetDeviceManagementUrl();
+    std::string url =
+        command_line->GetSwitchValueASCII(switches::kDeviceManagementUrl);
     if (!url.empty()) {
       service = new DeviceManagementService(url);
       service->ScheduleInitialization(0);
     }
   }
 
   int power_initial = GetSanitizedArg(
       switches::kEnterpriseEnrollmentInitialModulus);
   int power_limit = GetSanitizedArg(
       switches::kEnterpriseEnrollmentModulusLimit);
@@ skipping 199 matching lines @@
   // This samples |kZero| when there was no need for extra time, so that we can
   // measure the ratio of users that succeeded without needing a delay to the
   // total users going through OOBE.
   UMA_HISTOGRAM_CUSTOM_TIMES(kExtraTime, delta, kMin, kMax, kBuckets);
 
   if (!completion_callback_.is_null())
     completion_callback_.Run();
 }
 
 }  // namespace policy