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/active_directory_policy_manager.h b/chrome/browser/chromeos/policy/active_directory_policy_manager.h
new file mode 100644
index 0000000000000000000000000000000000000000..c6235963e9f6b43c25f33793b5b906eb27ab9156
--- /dev/null
+++ b/chrome/browser/chromeos/policy/active_directory_policy_manager.h
@@ -0,0 +1,72 @@
+// Copyright 2016 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_ACTIVE_DIRECTORY_POLICY_MANAGER_H_
+#define CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_POLICY_MANAGER_H_
+
+#include <memory>
+
+#include "base/macros.h"
+#include "base/memory/weak_ptr.h"
+#include "components/policy/core/common/cloud/cloud_policy_store.h"
+#include "components/policy/core/common/configuration_policy_provider.h"
+#include "components/signin/core/account_id/account_id.h"
+
+namespace policy {
+
+// 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:
+  ~ActiveDirectoryPolicyManager() override;
+
+  // Create manager for device policy.
+  static ActiveDirectoryPolicyManager* CreateForDevicePolicy(

[emaxx, 2017/01/18 18:35:55]

Why not returning through a std::unique_ptr here? This would make the fact of
the ownership passing obvious.

[Thiemo Nagel, 2017/01/18 18:54:21]

Thanks!  Done.

+      std::unique_ptr<CloudPolicyStore> store);
+
+  // Create manager for |accound_id| user policy.
+  static ActiveDirectoryPolicyManager* CreateForUserPolicy(
+      const AccountId& account_id,
+      std::unique_ptr<CloudPolicyStore> store);
+
+  // ConfigurationPolicyProvider:
+  void Init(SchemaRegistry* registry) override;
+  void Shutdown() override;
+  bool IsInitializationComplete(PolicyDomain domain) const override;
+  void RefreshPolicies() override;
+
+  // CloudPolicyStore::Observer:
+  void OnStoreLoaded(CloudPolicyStore* cloud_policy_store) override;
+  void OnStoreError(CloudPolicyStore* cloud_policy_store) override;
+
+  CloudPolicyStore* store() const { return store_.get(); }
+
+ private:
+  // |account_id| specifies the user to manage policy for.  If |account_id| is
+  // empty, device policy is managed.
+  ActiveDirectoryPolicyManager(const AccountId& account_id,
+                               std::unique_ptr<CloudPolicyStore> store);
+
+  // Publishes the policy that's currently cached in the store.
+  void PublishPolicy();
+
+  // Callback from authpolicyd.
+  void OnPolicyRefreshed(bool success);
+
+  const AccountId account_id_;
+  std::unique_ptr<CloudPolicyStore> store_;
+
+  // Must be last member.
+  base::WeakPtrFactory<ActiveDirectoryPolicyManager> weak_ptr_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(ActiveDirectoryPolicyManager);
+};
+
+}  // namespace policy
+
+#endif  // CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_POLICY_MANAGER_H_