Add timeout task to U2F HID state machine

device/u2f/u2f_hid_device.h

 // Copyright 2017 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 DEVICE_U2F_U2F_HID_DEVICE_H_
 #define DEVICE_U2F_U2F_HID_DEVICE_H_
 
 #include <list>
 
+#include "base/cancelable_callback.h"
 #include "device/hid/hid_service.h"
 #include "u2f_device.h"
 
 namespace net {
 class IOBuffer;
 }  // namespace net
 
 namespace device {
 
 class U2fMessage;
 class HidConnection;
 class HidDeviceInfo;
 
 class U2fHidDevice : public U2fDevice {
  public:
   U2fHidDevice(scoped_refptr<HidDeviceInfo>);
-  ~U2fHidDevice();
+  ~U2fHidDevice() final;
 
   // Send a U2f command to this device
   void DeviceTransact(std::unique_ptr<U2fApduCommand> command,
                       const DeviceCallback& callback) final;
   // Send a wink command if supported
   void TryWink(const WinkCallback& callback) final;
   // Use a string identifier to compare to other devices
   std::string GetId() final;
   // Command line flag to enable tests on actual U2f HID hardware
   static bool IsTestEnabled();
@@ skipping 26 matching lines @@
   // Write all message packets to device, and read response if expected
   void WriteMessage(std::unique_ptr<U2fMessage> message,
                     bool response_expected,
                     U2fHidMessageCallback callback);
   void PacketWritten(std::unique_ptr<U2fMessage> message,
                      bool response_expected,
                      U2fHidMessageCallback callback,
                      bool success);
   // Read all response message packets from device
   void ReadMessage(U2fHidMessageCallback callback);
-  void MessageReceived(const DeviceCallback& callback,
+  void MessageReceived(DeviceCallback callback,

[Reilly Grant (use Gerrit), 2017/04/17 22:25:17]

DeviceCallback is not a OnceCallback so it should be passed by const& here and
below.

[Casey Piper, 2017/04/17 23:02:38]

Done.

                        bool success,
                        std::unique_ptr<U2fMessage> message);
   void OnRead(U2fHidMessageCallback callback,
               bool success,
               scoped_refptr<net::IOBuffer> buf,
               size_t size);
   void OnReadContinuation(std::unique_ptr<U2fMessage> message,
                           U2fHidMessageCallback,
                           bool success,
                           scoped_refptr<net::IOBuffer> buf,
                           size_t size);
   void OnWink(const WinkCallback& callback,
               bool success,
               std::unique_ptr<U2fMessage> response);
+  void OnTimeout(DeviceCallback callback);
+  void OnDeviceTransact(bool success,
+                        std::unique_ptr<U2fApduResponse> response);
 
   State state_;
+  base::CancelableClosure timeout_callback_;
   std::list<std::pair<std::unique_ptr<U2fApduCommand>, DeviceCallback>>
       pending_transactions_;
   scoped_refptr<HidDeviceInfo> device_info_;
   scoped_refptr<HidConnection> connection_;
   base::WeakPtrFactory<U2fHidDevice> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(U2fHidDevice);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_U2F_U2F_HID_DEVICE_H_