Merge {Device,User}ActiveDirectoryPolicyManager into a single class

chrome/browser/policy/cloud/policy_header_service_factory.cc

 // Copyright 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/cloud/policy_header_service_factory.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/policy/core/browser/browser_policy_connector.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
 #include "components/policy/core/common/cloud/policy_header_service.h"
 
 #if defined(OS_CHROMEOS)
+#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/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"
 #else
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
 #endif
 
 namespace policy {
 
 namespace {
@@ skipping 58 matching lines @@
 
   CloudPolicyStore* user_store;
 #if defined(OS_CHROMEOS)
   Profile* profile = Profile::FromBrowserContext(context);
   CloudPolicyManager* cloud_manager =
       UserPolicyManagerFactoryChromeOS::GetCloudPolicyManagerForProfile(
           profile);
   if (cloud_manager) {
     user_store = cloud_manager->core()->store();
   } else {
-    UserActiveDirectoryPolicyManager* active_directory_manager =
+    ActiveDirectoryPolicyManager* active_directory_manager =
         UserPolicyManagerFactoryChromeOS::
             GetActiveDirectoryPolicyManagerForProfile(profile);
     if (!active_directory_manager)
       return nullptr;
     user_store = active_directory_manager->store();
   }
 #else
   CloudPolicyManager* manager =
       UserCloudPolicyManagerFactory::GetForBrowserContext(context);
   if (!manager)
     return nullptr;
   user_store = manager->core()->store();
 #endif
 
   std::unique_ptr<PolicyHeaderService> service =
       base::MakeUnique<PolicyHeaderService>(
           connector->device_management_service()->GetServerUrl(),
           kPolicyVerificationKeyHash, user_store);
   return new PolicyHeaderServiceWrapper(std::move(service));
 }
 
 // static
 PolicyHeaderServiceFactory* PolicyHeaderServiceFactory::GetInstance() {
   return base::Singleton<PolicyHeaderServiceFactory>::get();
 }
 
 }  // namespace policy