Move UserActivityDetector to ui/base/user_activity/.

ui/chromeos/user_activity_power_manager_notifier.h

Index: ui/chromeos/user_activity_power_manager_notifier.h
diff --git a/ui/chromeos/user_activity_power_manager_notifier.h b/ui/chromeos/user_activity_power_manager_notifier.h
index 47cbcf9e7a040c23f18c03a6a545521c3fc37e99..0d3e4e223fe4da0c79cbad0661e26e834efd2d7a 100644
--- a/ui/chromeos/user_activity_power_manager_notifier.h
+++ b/ui/chromeos/user_activity_power_manager_notifier.h
@@ -8,28 +8,25 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
+#include "ui/base/user_activity/user_activity_observer.h"
 #include "ui/chromeos/ui_chromeos_export.h"
-#include "ui/wm/core/user_activity_observer.h"
-
-namespace wm {
-class UserActivityDetector;
-}  // namespace wm
 
 namespace ui {
 
+class UserActivityDetector;
+
 // Notifies the power manager when the user is active.
 class UI_CHROMEOS_EXPORT UserActivityPowerManagerNotifier
-    : public ::wm::UserActivityObserver {
+    : public UserActivityObserver {
  public:
-  explicit UserActivityPowerManagerNotifier(
-      ::wm::UserActivityDetector* detector);
+  explicit UserActivityPowerManagerNotifier(UserActivityDetector* detector);
   virtual ~UserActivityPowerManagerNotifier();
 
   // UserActivityObserver implementation.
   virtual void OnUserActivity(const Event* event) override;
 
  private:
-  ::wm::UserActivityDetector* detector_;  // not owned
+  UserActivityDetector* detector_;  // not owned
 
   // Last time that the power manager was notified.
   base::TimeTicks last_notify_time_;