Merge {Device,User}ActiveDirectoryPolicyManager into a single class

chrome/browser/ui/webui/policy_ui_handler.cc

Index: chrome/browser/ui/webui/policy_ui_handler.cc
diff --git a/chrome/browser/ui/webui/policy_ui_handler.cc b/chrome/browser/ui/webui/policy_ui_handler.cc
index abc6abf5e36f3837bebb3d0dec77c173b54d6051..a18f2e59a7258bc8e505402bf98daf595d618d6e 100644
--- a/chrome/browser/ui/webui/policy_ui_handler.cc
+++ b/chrome/browser/ui/webui/policy_ui_handler.cc
@@ -55,11 +55,10 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/browser_process_platform_part.h"
+#include "chrome/browser/chromeos/policy/active_directory_policy_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
-#include "chrome/browser/chromeos/policy/device_active_directory_policy_manager.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
-#include "chrome/browser/chromeos/policy/user_active_directory_policy_manager.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.h"
 #include "chrome/browser/chromeos/settings/install_attributes.h"
@@ -543,7 +542,7 @@ void PolicyUIHandler::RegisterMessages() {
   policy::UserCloudPolicyManagerChromeOS* user_cloud_policy =
       policy::UserPolicyManagerFactoryChromeOS::GetCloudPolicyManagerForProfile(
           profile);
-  policy::UserActiveDirectoryPolicyManager* active_directory_policy =
+  policy::ActiveDirectoryPolicyManager* active_directory_policy =
       policy::UserPolicyManagerFactoryChromeOS::
           GetActiveDirectoryPolicyManagerForProfile(profile);
   if (local_account_service) {