Clean up HID backend and API.

device/hid/hid_utils_mac.h

Index: device/hid/hid_utils_mac.h
diff --git a/device/hid/hid_utils_mac.h b/device/hid/hid_utils_mac.h
index f1349aec1ad35c2e197c005224fd3321171022da..b6accc218122a40937844237e587eb1707879cfe 100644
--- a/device/hid/hid_utils_mac.h
+++ b/device/hid/hid_utils_mac.h
@@ -1,22 +1,28 @@
-// 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.
 
 #ifndef DEVICE_HID_HID_UTILS_MAC_H_
 #define DEVICE_HID_HID_UTILS_MAC_H_
 
-#include "base/callback.h"
-#include "base/memory/ref_counted.h"
-
+#include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/hid/IOHIDManager.h>
+#include <stdint.h>
+#include <string>
 
 namespace device {
 
-bool GetHidIntProperty(IOHIDDeviceRef device, CFStringRef key, int32_t* result);
+int32_t GetHidIntProperty(IOHIDDeviceRef device, CFStringRef key);
+
+std::string GetHidStringProperty(IOHIDDeviceRef device, CFStringRef key);
+
+bool TryGetHidIntProperty(IOHIDDeviceRef device,
+                          CFStringRef key,
+                          int32_t* result);
 
-bool GetHidStringProperty(IOHIDDeviceRef device,
-                       CFStringRef key,
-                       std::string* result);
+bool TryGetHidStringProperty(IOHIDDeviceRef device,
+                             CFStringRef key,
+                             std::string* result);
 
 }  // namespace device