Move ManagedModePolicyProvider functionality to ManagedUserSettingsService.

chrome/browser/policy/profile_policy_connector.cc

 // Copyright (c) 2013 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/profile_policy_connector.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
 #include "chrome/browser/policy/policy_service_impl.h"
 
-#if defined(ENABLE_MANAGED_USERS)
-#include "chrome/browser/policy/managed_mode_policy_provider.h"
-#endif
-
 #if defined(OS_CHROMEOS)
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h"
 #include "chrome/browser/chromeos/policy/login_profile_policy_provider.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h"
@@ skipping 61 matching lines @@
   if (special_user_policy_provider_)
     providers.push_back(special_user_policy_provider_.get());
 
 #else
   UserCloudPolicyManager* cloud_policy_manager =
       UserCloudPolicyManagerFactory::GetForProfile(profile_);
   if (cloud_policy_manager)
     providers.push_back(cloud_policy_manager);
 #endif
 
-#if defined(ENABLE_MANAGED_USERS)
-  managed_mode_policy_provider_ = ManagedModePolicyProvider::Create(
-      profile_, sequenced_task_runner, force_immediate_load);
-  managed_mode_policy_provider_->Init();
-  providers.push_back(managed_mode_policy_provider_.get());
-#endif
-
   policy_service_ = connector->CreatePolicyService(providers);
 
 #if defined(OS_CHROMEOS)
   if (is_primary_user_) {
     if (cloud_policy_manager)
       connector->SetUserPolicyDelegate(cloud_policy_manager);
     else if (special_user_policy_provider_)
       connector->SetUserPolicyDelegate(special_user_policy_provider_.get());
 
     // A reference to |user| is stored by the NetworkConfigurationUpdater until
@@ skipping 16 matching lines @@
 }
 
 void ProfilePolicyConnector::Shutdown() {
 #if defined(OS_CHROMEOS)
   if (is_primary_user_)
     g_browser_process->browser_policy_connector()->SetUserPolicyDelegate(NULL);
   network_configuration_updater_.reset();
   if (special_user_policy_provider_)
     special_user_policy_provider_->Shutdown();
 #endif
-
-#if defined(ENABLE_MANAGED_USERS)
-  if (managed_mode_policy_provider_)
-    managed_mode_policy_provider_->Shutdown();
-#endif
 }
 
 #if defined(OS_CHROMEOS)
 void ProfilePolicyConnector::SetPolicyCertVerifier(
     PolicyCertVerifier* cert_verifier) {
   if (network_configuration_updater_)
     network_configuration_updater_->SetPolicyCertVerifier(cert_verifier);
 }
 
 base::Closure ProfilePolicyConnector::GetPolicyCertTrustedCallback() {
@@ skipping 30 matching lines @@
       connector->GetDeviceLocalAccountPolicyService();
   if (!device_local_account_policy_service)
     return;
   special_user_policy_provider_.reset(new DeviceLocalAccountPolicyProvider(
       username, device_local_account_policy_service));
   special_user_policy_provider_->Init();
 }
 #endif
 
 }  // namespace policy