Check to ensure PowerObservers are added and removed on the same thread

base/power_monitor/power_observer.h

Index: base/power_monitor/power_observer.h
diff --git a/base/power_monitor/power_observer.h b/base/power_monitor/power_observer.h
index 6be70bba9d5368dfa0cf7a4f145247a1334430ec..935217ef103576e1785e84b431ef9380ed3905c7 100644
--- a/base/power_monitor/power_observer.h
+++ b/base/power_monitor/power_observer.h
@@ -7,14 +7,18 @@
 
 #include "base/base_export.h"
 #include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/threading/thread_checker.h"
 
 namespace base {
 
 class BASE_EXPORT PowerObserver {
+  friend class PowerMonitor;
+
  public:
   // Notification of a change in power status of the computer, such
   // as from switching between battery and A/C power.
-  virtual void OnPowerStateChange(bool on_battery_power) {};
+  virtual void OnPowerStateChange(bool on_battery_power) {}
 
   // Notification that the system is suspending.
   virtual void OnSuspend() {}
@@ -24,6 +28,8 @@ class BASE_EXPORT PowerObserver {
 
  protected:
   virtual ~PowerObserver() {}
+
+  scoped_ptr<base::ThreadChecker> thread_checker_;

[brettw, 2014/08/26 18:03:34]

A lot of stuff derives from this class. Having this object be both protected and
have a general name like this seems potentially confusing to derived classes.

Can this be private and have a name that implies it's for checking observer
adds/removes (a comment is probably also a good idea).

 };
 
 }  // namespace base