Revert of Implemented consumer management unenrollment.

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

 // Copyright 2014 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/chromeos/policy/browser_policy_connector_chromeos.h"
 
 #include <string>
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 131 matching lines @@
   global_user_cloud_policy_provider_ = new ProxyPolicyProvider();
   AddPolicyProvider(scoped_ptr<ConfigurationPolicyProvider>(
       global_user_cloud_policy_provider_));
 }
 
 BrowserPolicyConnectorChromeOS::~BrowserPolicyConnectorChromeOS() {}
 
 void BrowserPolicyConnectorChromeOS::Init(
     PrefService* local_state,
     scoped_refptr<net::URLRequestContextGetter> request_context) {
-  local_state_ = local_state;
   ChromeBrowserPolicyConnector::Init(local_state, request_context);
 
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(chromeos::switches::kEnableConsumerManagement)) {
     scoped_ptr<DeviceManagementService::Configuration> configuration(
         new DeviceManagementServiceConfiguration(
             GetDeviceManagementServerUrlForConsumer()));
     consumer_device_management_service_.reset(
         new DeviceManagementService(configuration.Pass()));
     consumer_device_management_service_->ScheduleInitialization(
         kServiceInitializationStartupDelay);
   }
 
   if (device_cloud_policy_manager_) {
     // Note: for now the |device_cloud_policy_manager_| is using the global
     // schema registry. Eventually it will have its own registry, once device
     // cloud policy for extensions is introduced. That means it'd have to be
     // initialized from here instead of BrowserPolicyConnector::Init().
 
     device_cloud_policy_manager_->Initialize(local_state);
     device_cloud_policy_manager_->AddDeviceCloudPolicyManagerObserver(this);
-    RestartDeviceCloudPolicyInitializer();
+
+    device_cloud_policy_initializer_.reset(
+        new DeviceCloudPolicyInitializer(
+            local_state,
+            device_management_service(),
+            consumer_device_management_service_.get(),
+            GetBackgroundTaskRunner(),
+            install_attributes_.get(),
+            state_keys_broker_.get(),
+            device_cloud_policy_manager_->device_store(),
+            device_cloud_policy_manager_));
+    device_cloud_policy_initializer_->Init();
   }
 
   device_local_account_policy_service_.reset(
       new DeviceLocalAccountPolicyService(
           chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
           chromeos::DeviceSettingsService::Get(),
           chromeos::CrosSettings::Get(),
           GetBackgroundTaskRunner(),
           GetBackgroundTaskRunner(),
           GetBackgroundTaskRunner(),
@@ skipping 112 matching lines @@
 
 // static
 void BrowserPolicyConnectorChromeOS::RegisterPrefs(
     PrefRegistrySimple* registry) {
   registry->RegisterIntegerPref(
       prefs::kDevicePolicyRefreshRate,
       CloudPolicyRefreshScheduler::kDefaultRefreshDelayMs);
 }
 
 void BrowserPolicyConnectorChromeOS::OnDeviceCloudPolicyManagerConnected() {
-  CHECK(device_cloud_policy_initializer_);
-
   // DeviceCloudPolicyInitializer might still be on the call stack, so we
   // should release the initializer after this function returns.
-  device_cloud_policy_initializer_->Shutdown();
-  base::MessageLoop::current()->DeleteSoon(
-      FROM_HERE, device_cloud_policy_initializer_.release());
-}
-
-void BrowserPolicyConnectorChromeOS::OnDeviceCloudPolicyManagerDisconnected() {
-  DCHECK(!device_cloud_policy_initializer_);
-
-  RestartDeviceCloudPolicyInitializer();
+  if (device_cloud_policy_initializer_) {
+    device_cloud_policy_initializer_->Shutdown();
+    base::MessageLoop::current()->DeleteSoon(
+        FROM_HERE, device_cloud_policy_initializer_.release());
+  }
 }
 
 void BrowserPolicyConnectorChromeOS::SetTimezoneIfPolicyAvailable() {
   typedef chromeos::CrosSettingsProvider Provider;
   Provider::TrustedStatus result =
       chromeos::CrosSettings::Get()->PrepareTrustedValues(base::Bind(
           &BrowserPolicyConnectorChromeOS::SetTimezoneIfPolicyAvailable,
           weak_ptr_factory_.GetWeakPtr()));
 
   if (result != Provider::TRUSTED)
     return;
 
   std::string timezone;
   if (chromeos::CrosSettings::Get()->GetString(chromeos::kSystemTimezonePolicy,
                                                &timezone) &&
       !timezone.empty()) {
     chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
         base::UTF8ToUTF16(timezone));
   }
 }
 
-void BrowserPolicyConnectorChromeOS::RestartDeviceCloudPolicyInitializer() {
-  device_cloud_policy_initializer_.reset(
-      new DeviceCloudPolicyInitializer(
-          local_state_,
-          device_management_service(),
-          consumer_device_management_service_.get(),
-          GetBackgroundTaskRunner(),
-          install_attributes_.get(),
-          state_keys_broker_.get(),
-          device_cloud_policy_manager_->device_store(),
-          device_cloud_policy_manager_));
-  device_cloud_policy_initializer_->Init();
-}
-
 }  // namespace policy