Move UserActivityDetector to ui/base/user_activity/.

ui/base/user_activity/user_activity_detector_unittest.cc

 // Copyright 2014 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.
 
-#include "ui/wm/core/user_activity_detector.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
-#include "ui/aura/test/aura_test_base.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/user_activity/user_activity_observer.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/geometry/point.h"
-#include "ui/wm/core/user_activity_observer.h"
 
-namespace wm {
+namespace ui {
 
 // Implementation that just counts the number of times we've been told that the
 // user is active.
 class TestUserActivityObserver : public UserActivityObserver {
  public:
   TestUserActivityObserver() : num_invocations_(0) {}
 
   int num_invocations() const { return num_invocations_; }
   void reset_stats() { num_invocations_ = 0; }
 
   // UserActivityObserver implementation.
   void OnUserActivity(const ui::Event* event) override { num_invocations_++; }
 
  private:
   // Number of times that OnUserActivity() has been called.
   int num_invocations_;
 
   DISALLOW_COPY_AND_ASSIGN(TestUserActivityObserver);
 };
 
-class UserActivityDetectorTest : public aura::test::AuraTestBase {
+class UserActivityDetectorTest : public testing::Test {
  public:
-  UserActivityDetectorTest() {}
-  ~UserActivityDetectorTest() override {}
-
-  void SetUp() override {
-    AuraTestBase::SetUp();
-    observer_.reset(new TestUserActivityObserver);
-    detector_.reset(new UserActivityDetector);
+  UserActivityDetectorTest()
+      : detector_(new UserActivityDetector),
+        observer_(new TestUserActivityObserver) {
     detector_->AddObserver(observer_.get());
-
     now_ = base::TimeTicks::Now();
     detector_->set_now_for_test(now_);
   }
 
-  void TearDown() override {
+  ~UserActivityDetectorTest() override {
     detector_->RemoveObserver(observer_.get());
-    AuraTestBase::TearDown();
   }
 
  protected:
   // Move |detector_|'s idea of the current time forward by |delta|.
   void AdvanceTime(base::TimeDelta delta) {
     now_ += delta;
     detector_->set_now_for_test(now_);
   }
 
   scoped_ptr<UserActivityDetector> detector_;
@@ skipping 124 matching lines @@
   ui::MouseEvent mouse_event(
       ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), ui::EF_IS_SYNTHESIZED,
       ui::EF_NONE);
   detector_->OnMouseEvent(&mouse_event);
   EXPECT_FALSE(mouse_event.handled());
   EXPECT_EQ(base::TimeTicks().ToInternalValue(),
             detector_->last_activity_time().ToInternalValue());
   EXPECT_EQ(0, observer_->num_invocations());
 }
 
-}  // namespace wm
+}  // namespace ui