Removes mouse listeners from UserInputMonitor.

media/base/user_input_monitor_unittest.cc

 // Copyright 2013 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 "media/base/user_input_monitor.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "media/base/keyboard_event_counter.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkPoint.h"
 
 #if defined(OS_LINUX)
 #include "base/files/file_descriptor_watcher_posix.h"
 #endif
 
 namespace media {
 
 class MockMouseListener : public UserInputMonitor::MouseEventListener {

[Wez, 2017/01/10 02:45:10]

We've removed the MouseEventListener, so you can get rid of this, and the
relevant calls in the code below.

[CJ, 2017/01/10 02:55:02]

Done.

  public:
   MOCK_METHOD1(OnMouseMoved, void(const SkIPoint& position));
 
   virtual ~MockMouseListener() {}
 };
 
-#if defined(OS_LINUX) || defined(OS_WIN)
-TEST(UserInputMonitorTest, KeyPressCounter) {
-  KeyboardEventCounter counter;
-
-  EXPECT_EQ(0u, counter.GetKeyPressCount());
-
-  counter.OnKeyboardEvent(ui::ET_KEY_PRESSED, ui::VKEY_0);
-  EXPECT_EQ(1u, counter.GetKeyPressCount());
-
-  // Holding the same key without releasing it does not increase the count.
-  counter.OnKeyboardEvent(ui::ET_KEY_PRESSED, ui::VKEY_0);
-  EXPECT_EQ(1u, counter.GetKeyPressCount());
-
-  // Releasing the key does not affect the total count.
-  counter.OnKeyboardEvent(ui::ET_KEY_RELEASED, ui::VKEY_0);
-  EXPECT_EQ(1u, counter.GetKeyPressCount());
-
-  counter.OnKeyboardEvent(ui::ET_KEY_PRESSED, ui::VKEY_0);
-  counter.OnKeyboardEvent(ui::ET_KEY_RELEASED, ui::VKEY_0);
-  EXPECT_EQ(2u, counter.GetKeyPressCount());
-}
-#endif  // defined(OS_LINUX) || defined(OS_WIN)
-
 TEST(UserInputMonitorTest, CreatePlatformSpecific) {
 #if defined(OS_LINUX)
   base::MessageLoopForIO message_loop;
   base::FileDescriptorWatcher file_descriptor_watcher(&message_loop);
 #else
   base::MessageLoopForUI message_loop;
 #endif  // defined(OS_LINUX)
 
   base::RunLoop run_loop;
   std::unique_ptr<UserInputMonitor> monitor = UserInputMonitor::Create(
@@ skipping 12 matching lines @@
 #endif  // !define(OS_MACOSX)
 
   monitor->EnableKeyPressMonitoring();
   monitor->DisableKeyPressMonitoring();
 
   monitor.reset();
   run_loop.RunUntilIdle();
 }
 
 }  // namespace media