Revert of Fix for menus blocking user activity detection (Retry 2). (patchset #1 id:1 of https://codereview.chromium.org/1024583003/)

Reason for revert:
Breaks multiple clicking on 2nd display

Original issue's description:
> Fix for menus blocking user activity detection (Retry 2).
>
> Original CL reverted here: https://codereview.chromium.org/1013003002/
>
> Nothing has changed from that CL above. We are relanding after Oshima
> prevented marking events created from the same native event as "repeat"
> in this CL https://codereview.chromium.org/1017323002/
>
> Menus used to block detecting user activity. The fix works by making the
> UserActivityDetector a PlatformEventObserver rather than an
> EventHandler.
> Also made sure that PlatformEventSource has an instance in
> ozone_platform_test.cc
>
> TBR=sadrul@chromium.org,spang@chromium.org,oshima@chromium.org,jamescook@chromium.org
> BUG=462735
> TEST=ui_base_unittests --gtest_filter=UserActivityDetectorTest.*
>
> Committed: https://crrev.com/dbfa9102e7c6dfa13439ef1502d4baa9c3a31f31
> Cr-Commit-Position: refs/heads/master@{#321426}

TBR=jamescook@chromium.org,oshima@chromium.org,sadrul@chromium.org,afakhry@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=462735, 472222

Review URL: https://codereview.chromium.org/1053773003

Cr-Commit-Position: refs/heads/master@{#323394}

1 files changed, 1 insertions, 12 deletions

diff --git a/ui/ozone/platform/test/ozone_platform_test.cc b/ui/ozone/platform/test/ozone_platform_test.cc
index d94fde9..fce3a9d 100644
--- a/ui/ozone/platform/test/ozone_platform_test.cc
+++ b/ui/ozone/platform/test/ozone_platform_test.cc
@@ -25,17 +25,6 @@ namespace ui {
 
 namespace {
 
-// A test implementation of PlatformEventSource that we can instantiate to make
-// sure that the PlatformEventSource has an instance while in unit tests.
-class TestPlatformEventSource : public ui::PlatformEventSource {
- public:
-  TestPlatformEventSource() {}
-  ~TestPlatformEventSource() override {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TestPlatformEventSource);
-};
-
 // OzonePlatform for testing
 //
 // This platform dumps images to a file for testing purposes.
@@ -78,7 +67,7 @@ class OzonePlatformTest : public OzonePlatform {
     window_manager_->Initialize();
     // This unbreaks tests that create their own.
     if (!PlatformEventSource::GetInstance())
-      platform_event_source_.reset(new TestPlatformEventSource);
+      platform_event_source_ = PlatformEventSource::CreateDefault();
     KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
         make_scoped_ptr(new StubKeyboardLayoutEngine()));