Merge {Device,User}ActiveDirectoryPolicyManager into a single class

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_
 
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 21 matching lines @@
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace policy {
 
 class AffiliatedCloudPolicyInvalidator;
 class AffiliatedInvalidationServiceProvider;
 class AffiliatedRemoteCommandsInvalidator;
 class BluetoothPolicyHandler;
-class DeviceActiveDirectoryPolicyManager;
+class ActiveDirectoryPolicyManager;
 class DeviceCloudPolicyInitializer;
 class DeviceLocalAccountPolicyService;
 struct EnrollmentConfig;
 class NetworkConfigurationUpdater;
 class ProxyPolicyProvider;
 class ServerBackedStateKeysBroker;
 
 // Extends ChromeBrowserPolicyConnector with the setup specific to Chrome OS.
 class BrowserPolicyConnectorChromeOS
     : public ChromeBrowserPolicyConnector,
@@ skipping 47 matching lines @@
   // factors. See DeviceCloudPolicyInitializer::GetPrescribedEnrollmentConfig()
   // for details.
   EnrollmentConfig GetPrescribedEnrollmentConfig() const;
 
   // May be nullptr, e.g. for devices managed by Active Directory.
   DeviceCloudPolicyManagerChromeOS* GetDeviceCloudPolicyManager() const {
     return device_cloud_policy_manager_;
   }
 
   // May be nullptr, e.g. for cloud-managed devices.
-  DeviceActiveDirectoryPolicyManager* GetDeviceActiveDirectoryPolicyManager()
-      const {
+  ActiveDirectoryPolicyManager* GetDeviceActiveDirectoryPolicyManager() const {
     return device_active_directory_policy_manager_;
   }
 
   // May be nullptr, e.g. for devices managed by Active Directory.
   DeviceCloudPolicyInitializer* GetDeviceCloudPolicyInitializer() const {
     return device_cloud_policy_initializer_.get();
   }
 
   // May be nullptr, e.g. for devices managed by Active Directory.
   DeviceLocalAccountPolicyService* GetDeviceLocalAccountPolicyService() const {
@@ skipping 52 matching lines @@
   // cryptohome client.
   std::unique_ptr<chromeos::attestation::AttestationFlow>
   CreateAttestationFlow();
 
   // Components of the device cloud policy implementation.
   std::unique_ptr<ServerBackedStateKeysBroker> state_keys_broker_;
   std::unique_ptr<chromeos::InstallAttributes> install_attributes_;
   std::unique_ptr<AffiliatedInvalidationServiceProvider>
       affiliated_invalidation_service_provider_;
   DeviceCloudPolicyManagerChromeOS* device_cloud_policy_manager_ = nullptr;
-  DeviceActiveDirectoryPolicyManager* device_active_directory_policy_manager_ =
+  ActiveDirectoryPolicyManager* device_active_directory_policy_manager_ =
       nullptr;
   PrefService* local_state_ = nullptr;
   std::unique_ptr<DeviceCloudPolicyInitializer>
       device_cloud_policy_initializer_;
   std::unique_ptr<DeviceLocalAccountPolicyService>
       device_local_account_policy_service_;
   std::unique_ptr<AffiliatedCloudPolicyInvalidator>
       device_cloud_policy_invalidator_;
   std::unique_ptr<AffiliatedRemoteCommandsInvalidator>
       device_remote_commands_invalidator_;
@@ skipping 11 matching lines @@
   std::unique_ptr<NetworkConfigurationUpdater> network_configuration_updater_;
 
   base::WeakPtrFactory<BrowserPolicyConnectorChromeOS> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnectorChromeOS);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_