Remote assistance on Chrome OS Part IV - It2MeHost

remoting/host/policy_hack/policy_watcher.h

 // Copyright (c) 2012 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 REMOTING_HOST_POLICY_HACK_POLICY_WATCHER_H_
 #define REMOTING_HOST_POLICY_HACK_POLICY_WATCHER_H_
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
+#include "remoting/host/chromoting_host_context.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 class TimeDelta;
 class WaitableEvent;
 }  // namespace base
 
 namespace remoting {
 namespace policy_hack {
 
@@ skipping 10 matching lines @@
       scoped_refptr<base::SingleThreadTaskRunner> task_runner);
   virtual ~PolicyWatcher();
 
   // This guarantees that the |policy_callback| is called at least once with
   // the current policies.  After that, |policy_callback| will be called
   // whenever a change to any policy is detected. It will then be called only
   // with the changed policies.
   virtual void StartWatching(const PolicyCallback& policy_callback);
 
   // Should be called after StartWatching() before the object is deleted. Calls
-  // just wait for |done| to be signaled before deleting the object.
-  virtual void StopWatching(base::WaitableEvent* done);
+  // should wait for |stopped_callback| to be called before deleting the object.
+  virtual void StopWatching(const base::Closure& stopped_callback);
 
   // Implemented by each platform.  This message loop should be an IO message
   // loop.
   static PolicyWatcher* Create(
+      ChromotingHostContext* context,

[Wez, 2014/10/17 17:58:01]

Don't pass the ChromotingHostContext around; it's not designed for that. Pull
out the bits you need and pass them in to the PolicyWatcher.

This method should be:
static scoped_ptr<PolicyWatcher> Create(...)

[kelvinp, 2014/10/20 00:21:18]

I will avoid passing the context but pass the policy_service instead.
Fixing the scoped_ptr is beyond the scope of this change though.

       scoped_refptr<base::SingleThreadTaskRunner> task_runner);
 
   // The name of the NAT traversal policy.
   static const char kNatPolicyName[];
 
   // The name of the policy for requiring 2-factor authentication.
   static const char kHostRequireTwoFactorPolicyName[];
 
   // The name of the host domain policy.
   static const char kHostDomainPolicyName[];
@@ skipping 43 matching lines @@
 
   // Used for time-based reloads in case something goes wrong with the
   // notification system.
   void ScheduleFallbackReloadTask();
   void ScheduleReloadTask(const base::TimeDelta& delay);
 
   // Returns a DictionaryValue containing the default values for each policy.
   const base::DictionaryValue& Defaults() const;
 
  private:
+  virtual void StopWatchingOnPolicyWatcherThread();
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   PolicyCallback policy_callback_;
 
   scoped_ptr<base::DictionaryValue> old_policies_;
   scoped_ptr<base::DictionaryValue> default_values_;
   scoped_ptr<base::DictionaryValue> bad_type_values_;
 
   // Allows us to cancel any inflight FileWatcher events or scheduled reloads.
   base::WeakPtrFactory<PolicyWatcher> weak_factory_;
 };
 
 }  // namespace policy_hack
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_POLICY_HACK_POLICY_WATCHER_H_