Removes mouse listeners from UserInputMonitor.

media/base/user_input_monitor.h

Index: media/base/user_input_monitor.h
diff --git a/media/base/user_input_monitor.h b/media/base/user_input_monitor.h
index 4a8777dc6c336240917a735a770c80129284159c..604a9e57b76eab1665c300921b68d04125c090f3 100644
--- a/media/base/user_input_monitor.h
+++ b/media/base/user_input_monitor.h
@@ -11,36 +11,21 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/observer_list_threadsafe.h"
 #include "base/synchronization/lock.h"
 #include "media/base/media_export.h"
 
-struct SkIPoint;
-
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace media {
 
-// Monitors and notifies about mouse movements and keyboard events.
+// Monitors and notifies about keyboard events.
 // Thread safe. The listeners are called on the thread where the listeners are
 // added.

[Wez, 2017/01/03 23:59:40]

nit: Remove the comment about listeners, since there is no listener interface
any more.

[CJ, 2017/01/07 00:12:35]

Done.

[Wez, 2017/01/09 22:38:43]

nit: We still need the note about being thread-safe, since it seems that this
class still gets called from various media threads :-/

[CJ, 2017/01/09 23:35:49]

Done.

 class MEDIA_EXPORT UserInputMonitor {
  public:
-  // The interface to receive mouse movement events.
-  class MEDIA_EXPORT MouseEventListener {
-   public:
-    // |position| is the new mouse position.
-    virtual void OnMouseMoved(const SkIPoint& position) = 0;
-
-   protected:
-    virtual ~MouseEventListener() {}
-  };
-  typedef base::ObserverListThreadSafe<UserInputMonitor::MouseEventListener>
-      MouseListenerList;
-
-  UserInputMonitor();
+  UserInputMonitor() : key_press_counter_references_(0) {}
   virtual ~UserInputMonitor();
 
   // Creates a platform-specific instance of UserInputMonitor.
@@ -50,12 +35,6 @@ class MEDIA_EXPORT UserInputMonitor {
       const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
       const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner);
 
-  // The same |listener| should only be added once.
-  // The clients should make sure to call Remove*Listener before |listener| is
-  // destroyed.
-  void AddMouseListener(MouseEventListener* listener);
-  void RemoveMouseListener(MouseEventListener* listener);
-
   // A caller must call EnableKeyPressMonitoring and
   // DisableKeyPressMonitoring in pair.
   void EnableKeyPressMonitoring();
@@ -69,21 +48,12 @@ class MEDIA_EXPORT UserInputMonitor {
   // any assumption on the initial value.
   virtual size_t GetKeyPressCount() const = 0;
 
- protected:
-  scoped_refptr<MouseListenerList> mouse_listeners() {
-    return mouse_listeners_;
-  }
-
  private:
   virtual void StartKeyboardMonitoring() = 0;
   virtual void StopKeyboardMonitoring() = 0;
-  virtual void StartMouseMonitoring() = 0;
-  virtual void StopMouseMonitoring() = 0;
 
   base::Lock lock_;
   size_t key_press_counter_references_;
-  size_t mouse_listeners_count_;
-  scoped_refptr<MouseListenerList> mouse_listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(UserInputMonitor);
 };