Merge "Fix double-close in EventConverterEvdevImpl"

ui/events/ozone/evdev/event_converter_evdev.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 <errno.h>
 #include <linux/input.h>
 #include <stddef.h>
 
 #include "ui/events/ozone/evdev/event_converter_evdev.h"
 
@@ skipping 16 matching lines @@
                                          uint16_t vendor_id,
                                          uint16_t product_id)
     : fd_(fd),
       path_(path),
       input_device_(id, type, name, GetInputPathInSys(path), vendor_id,
                     product_id) {}
 
 EventConverterEvdev::~EventConverterEvdev() {
   DCHECK(!enabled_);
   DCHECK(!watching_);
-  if (fd_ >= 0)
-    close(fd_);
 }
 
 void EventConverterEvdev::Start() {
   base::MessageLoopForUI::current()->WatchFileDescriptor(
       fd_, true, base::MessagePumpLibevent::WATCH_READ, &controller_, this);
   watching_ = true;
 }
 
 void EventConverterEvdev::Stop() {
   controller_.StopWatchingFileDescriptor();
@@ skipping 105 matching lines @@
 
 base::TimeTicks EventConverterEvdev::TimeTicksFromInputEvent(
     const input_event& event) {
   base::TimeTicks timestamp =
       ui::EventTimeStampFromSeconds(event.time.tv_sec) +
       base::TimeDelta::FromMicroseconds(event.time.tv_usec);
   ValidateEventTimeClock(&timestamp);
   return timestamp;
 }
 }  // namespace ui