evdev: Fix infinite loop when devices are unplugged

ui/events/ozone/event_factory_ozone.h

 // Copyright (c) 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.
 
 #ifndef UI_EVENTS_OZONE_EVENT_FACTORY_OZONE_H_
 #define UI_EVENTS_OZONE_EVENT_FACTORY_OZONE_H_
 
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_pump_libevent.h"
 #include "ui/events/events_export.h"
 #include "ui/events/ozone/event_converter_ozone.h"
 
 namespace ui {
 
 // Creates and dispatches |ui.Event|'s. Ozone assumes that events arrive on file

[rjkroege, 2014/01/27 19:03:16]

You have convinced me that altering the assumption of 1-to-1 mapping between
fd's and EventCovnerter instances is reasonable. 

However, given that, there are additional parts of this class that need to
evolve right? Like the above text. And the AddEventConverter  -- the fd argument
is not necessarily appropriate? And the maps?

 // descriptors with one  |EventConverterOzone| instance for each descriptor.
 // Ozone presumes that the set of file desctiprtors can vary at runtime so this
 // class supports dynamically adding and removing |EventConverterOzone|
 // instances as necessary.
 class EVENTS_EXPORT EventFactoryOzone {
  public:
   EventFactoryOzone();
   virtual ~EventFactoryOzone();
 
   // Called from WindowTreeHostOzone to initialize and start processing events.
@@ skipping 13 matching lines @@
   // Add an |EventConverterOzone| instances for the given file descriptor.
   // Transfers ownership of the |EventConverterOzone| to this class.
   void AddEventConverter(int fd, scoped_ptr<EventConverterOzone> converter);
 
   // Remote the |EventConverterOzone|
   void RemoveEventConverter(int fd);
 
  private:
   // |EventConverterOzone| for each file descriptor.
   typedef EventConverterOzone* Converter;
-  typedef base::MessagePumpLibevent::FileDescriptorWatcher* FDWatcher;
   std::map<int, Converter> converters_;
-  std::map<int, FDWatcher> watchers_;
 
   static EventFactoryOzone* impl_;  // not owned
 
   DISALLOW_COPY_AND_ASSIGN(EventFactoryOzone);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_OZONE_EVENT_FACTORY_OZONE_H_