Merge {Device,User}ActiveDirectoryPolicyManager into a single class

chrome/browser/chromeos/policy/active_directory_policy_manager.h

Index: chrome/browser/chromeos/policy/active_directory_policy_manager.h
diff --git a/chrome/browser/chromeos/policy/user_active_directory_policy_manager.h b/chrome/browser/chromeos/policy/active_directory_policy_manager.h
similarity index 51%
rename from chrome/browser/chromeos/policy/user_active_directory_policy_manager.h
rename to chrome/browser/chromeos/policy/active_directory_policy_manager.h
index fcdb485af7361394fd0440f873a5ca706e30bf40..37bb7e07127f85eed80429b08d995117a700e948 100644
--- a/chrome/browser/chromeos/policy/user_active_directory_policy_manager.h
+++ b/chrome/browser/chromeos/policy/active_directory_policy_manager.h
@@ -2,8 +2,8 @@
 // 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_USER_ACTIVE_DIRECTORY_POLICY_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_POLICY_USER_ACTIVE_DIRECTORY_POLICY_MANAGER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_POLICY_MANAGER_H_
+#define CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_POLICY_MANAGER_H_
 
 #include <memory>
 
@@ -15,17 +15,23 @@
 
 namespace policy {
 
-// ConfigurationPolicyProvider for policy from Active Directory.  The policy is
-// fetched from the Domain Controller by authpolicyd which stores it in session
-// manager and from where it is loaded by UserActiveDirectoryPolicyManager.
-// TODO(tnagel): This is a slightly modified copy of
-// DeviceActiveDirectoryPolicyManager ==> merge the two classes.
-class UserActiveDirectoryPolicyManager : public ConfigurationPolicyProvider,
-                                         public CloudPolicyStore::Observer {
+// ConfigurationPolicyProvider for device or user policy from Active Directory.
+// The choice of constructor determines whether device or user policy is
+// provided.  The policy is fetched from the Domain Controller by authpolicyd
+// which stores it in session manager and from where it is loaded by
+// ActiveDirectoryPolicyManager.
+class ActiveDirectoryPolicyManager : public ConfigurationPolicyProvider,
+                                     public CloudPolicyStore::Observer {
  public:
-  UserActiveDirectoryPolicyManager(const AccountId& account_id,
-                                   std::unique_ptr<CloudPolicyStore> store);
-  ~UserActiveDirectoryPolicyManager() override;
+  // Device policy.
+  explicit ActiveDirectoryPolicyManager(

[emaxx, 2017/01/18 01:19:44]

The intent could be made more explicit by exposing the factory methods (e.g.
CreateForDevicePolicy) instead of the constructors. This would also help to
understand the code that uses them.

[Thiemo Nagel, 2017/01/18 18:30:31]

Good idea!  Done.

+      std::unique_ptr<CloudPolicyStore> store);
+
+  // User policy for |account_id|.
+  ActiveDirectoryPolicyManager(const AccountId& account_id,
+                               std::unique_ptr<CloudPolicyStore> store);
+
+  ~ActiveDirectoryPolicyManager() override;
 
   // ConfigurationPolicyProvider:
   void Init(SchemaRegistry* registry) override;
@@ -50,11 +56,11 @@ class UserActiveDirectoryPolicyManager : public ConfigurationPolicyProvider,
   std::unique_ptr<CloudPolicyStore> store_;
 
   // Must be last member.
-  base::WeakPtrFactory<UserActiveDirectoryPolicyManager> weak_ptr_factory_;
+  base::WeakPtrFactory<ActiveDirectoryPolicyManager> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(UserActiveDirectoryPolicyManager);
+  DISALLOW_COPY_AND_ASSIGN(ActiveDirectoryPolicyManager);
 };
 
 }  // namespace policy
 
-#endif  // CHROME_BROWSER_CHROMEOS_POLICY_USER_ACTIVE_DIRECTORY_POLICY_MANAGER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_POLICY_MANAGER_H_