Merge {Device,User}ActiveDirectoryPolicyManager into a single class

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h

Index: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
index 95ed147efeadb9002bd1f94352c3eb9bb79b377c..e994bf586b3c627cd9e7d5fcc87b90c775c3f798 100644
--- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
+++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
@@ -39,7 +39,7 @@ class AffiliatedCloudPolicyInvalidator;
 class AffiliatedInvalidationServiceProvider;
 class AffiliatedRemoteCommandsInvalidator;
 class BluetoothPolicyHandler;
-class DeviceActiveDirectoryPolicyManager;
+class ActiveDirectoryPolicyManager;
 class DeviceCloudPolicyInitializer;
 class DeviceLocalAccountPolicyService;
 struct EnrollmentConfig;
@@ -107,8 +107,7 @@ class BrowserPolicyConnectorChromeOS
   }
 
   // May be nullptr, e.g. for cloud-managed devices.
-  DeviceActiveDirectoryPolicyManager* GetDeviceActiveDirectoryPolicyManager()
-      const {
+  ActiveDirectoryPolicyManager* GetDeviceActiveDirectoryPolicyManager() const {
     return device_active_directory_policy_manager_;
   }
 
@@ -181,7 +180,7 @@ class BrowserPolicyConnectorChromeOS
   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>