Extract AD policy scheduler into separate class

chrome/browser/chromeos/policy/active_directory_policy_manager.h

 // 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/cancelable_callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "base/time/time.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/policy/core/common/configuration_policy_provider.h"
+#include "components/policy/core/common/policy_scheduler.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,
@@ skipping 24 matching lines @@
 
  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);
 
   // Publish the policy that's currently cached in the store.
   void PublishPolicy();
 
-  // Callback from authpolicyd.
+  // Calls into authpolicyd to fetch policy. Reports success or failure via
+  // |callback|.
+  void DoRefresh(PolicyScheduler::TaskCallback callback);

[pmarko, 2017/06/19 10:14:37]

Do you think it'd be worth mentioning in a comment that this is going to be
executed by the scheduler?

[Thiemo Nagel, 2017/06/19 22:29:51]

I'm leaning towards not mentioning this because comments like this tend to get
out of sync quickly and also with codesearch we have a quick and easy way to
find the caller.

[pmarko, 2017/06/20 20:01:05]

Ack, I was just asking about this for consistency with the OnPolicyRefreshed
comment.

+
+  // Called by scheduler with result of policy fetch.
   void OnPolicyRefreshed(bool success);
 
-  // Schedule next policy refresh to run after |delay|.  (Deletes any previously
-  // scheduled refresh tasks.)
-  void ScheduleRefresh(base::TimeDelta delay);
-
-  // Schedule next automatic policy refresh based on initial fetch delay or
-  // refresh interval.  (Deletes any previously scheduled refresh tasks.)
-  void ScheduleAutomaticRefresh();
-
-  // Actually execute the scheduled policy refresh.
-  void RunScheduledRefresh();
-
   const AccountId account_id_;
   std::unique_ptr<CloudPolicyStore> store_;
 
-  // Whether a policy refresh is in progress (and thus any further requests need
-  // to be blocked).
-  bool refresh_in_progress_ = false;
-  // Whether a refresh had been blocked and thus the next refresh needs to be
-  // scheduled at the shorter "retry" interval.
-  bool retry_refresh_ = false;
-  base::TimeTicks last_refresh_;
-  const base::TimeTicks startup_ = base::TimeTicks::Now();
-  std::unique_ptr<base::CancelableClosure> refresh_task_;
+  std::unique_ptr<PolicyScheduler> scheduler_;
 
   // Must be last member.
-  base::WeakPtrFactory<ActiveDirectoryPolicyManager> weak_ptr_factory_;
+  base::WeakPtrFactory<ActiveDirectoryPolicyManager> weak_ptr_factory_{this};
 
   DISALLOW_COPY_AND_ASSIGN(ActiveDirectoryPolicyManager);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_ACTIVE_DIRECTORY_POLICY_MANAGER_H_