Clean up HID backend and API.

device/hid/hid_service_linux.h

Index: device/hid/hid_service_linux.h
diff --git a/device/hid/hid_service_linux.h b/device/hid/hid_service_linux.h
index ba58fada58d0c059c012497c213c66762fae35a5..ae730cea7ef4f0404fc65076d77a6759df1fb130 100644
--- a/device/hid/hid_service_linux.h
+++ b/device/hid/hid_service_linux.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,6 +7,9 @@
 
 #include <libudev.h>
 
+#include <map>
+#include <string>
+
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_pump_libevent.h"
@@ -50,7 +53,8 @@ class HidServiceLinux : public HidService,
  public:
   HidServiceLinux();
 
-  virtual scoped_refptr<HidConnection> Connect(std::string device_id) OVERRIDE;
+  virtual scoped_refptr<HidConnection> Connect(const HidDeviceId& device_id)
+      OVERRIDE;
 
   // Implements base::MessagePumpLibevent::Watcher
   virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
@@ -60,8 +64,8 @@ class HidServiceLinux : public HidService,
   virtual ~HidServiceLinux();
 
   void Enumerate();
-  void PlatformDeviceAdd(udev_device* device);
-  void PlatformDeviceRemove(udev_device* raw_dev);
+  void PlatformAddDevice(udev_device* device);
+  void PlatformRemoveDevice(udev_device* raw_dev);
 
   scoped_ptr<udev, UdevDeleter> udev_;
   scoped_ptr<udev_monitor, UdevMonitorDeleter> monitor_;