Move UserActivityDetector to ui/base/user_activity/.

ui/chromeos/user_activity_power_manager_notifier.cc

Index: ui/chromeos/user_activity_power_manager_notifier.cc
diff --git a/ui/chromeos/user_activity_power_manager_notifier.cc b/ui/chromeos/user_activity_power_manager_notifier.cc
index 7952b5986a0f88d170766ec21a8a078981782d25..fb2f671aaf8db7c3437a50f0dd714f441a918d70 100644
--- a/ui/chromeos/user_activity_power_manager_notifier.cc
+++ b/ui/chromeos/user_activity_power_manager_notifier.cc
@@ -6,10 +6,10 @@
 
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes_posix.h"
-#include "ui/wm/core/user_activity_detector.h"
 
 namespace ui {
 namespace {
@@ -42,7 +42,7 @@ power_manager::UserActivityType GetUserActivityTypeForEvent(
 }  // namespace
 
 UserActivityPowerManagerNotifier::UserActivityPowerManagerNotifier(
-    ::wm::UserActivityDetector* detector)
+    UserActivityDetector* detector)
     : detector_(detector) {
   detector_->AddObserver(this);
 }