Introducing chrome.usb.getDevices/openDevice API

chrome/common/extensions/permissions/usb_device_permission_data.cc

 // Copyright (c) 2012 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 "chrome/common/extensions/permissions/usb_device_permission_data.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 26 matching lines @@
     interface_id_(interface_id) {
 }
 
 bool UsbDevicePermissionData::Check(
     const APIPermission::CheckParam* param) const {
   if (!param)
     return false;
   const UsbDevicePermission::CheckParam& specific_param =
       *static_cast<const UsbDevicePermission::CheckParam*>(param);
   return vendor_id_ == specific_param.vendor_id &&
-      product_id_ == specific_param.product_id &&
-      interface_id_ == specific_param.interface_id;
+         product_id_ == specific_param.product_id &&
+         (specific_param.interface_id == UNSPECIFIED_INTERFACE ||
+          interface_id_ == specific_param.interface_id);
 }
 
 scoped_ptr<base::Value> UsbDevicePermissionData::ToValue() const {
   base::DictionaryValue* result = new base::DictionaryValue();
   result->SetInteger(kVendorIdKey, vendor_id_);
   result->SetInteger(kProductIdKey, product_id_);
   result->SetInteger(kInterfaceIdKey, interface_id_);
   return scoped_ptr<base::Value>(result);
 }
 
@@ skipping 13 matching lines @@
   vendor_id_ = temp;
 
   if (!dict_value->GetInteger(kProductIdKey, &temp))
     return false;
   if (temp < 0 || temp > kuint16max)
     return false;
   product_id_ = temp;
 
   if (!dict_value->GetInteger(kInterfaceIdKey, &temp))
     interface_id_ = ANY_INTERFACE;
+  else if (temp < ANY_INTERFACE || temp > kuint8max)
+    return false;
   else
     interface_id_ = temp;
 
   return true;
 }
 
 bool UsbDevicePermissionData::operator<(
     const UsbDevicePermissionData& rhs) const {
   if (vendor_id_ == rhs.vendor_id_) {
     if (product_id_ == rhs.product_id_)
       return interface_id_ < rhs.interface_id_;
 
     return product_id_ < rhs.product_id_;
   }
   return vendor_id_ < rhs.vendor_id_;
 }
 
 bool UsbDevicePermissionData::operator==(
     const UsbDevicePermissionData& rhs) const {
   return vendor_id_ == rhs.vendor_id_ &&
       product_id_ == rhs.product_id_ &&
       interface_id_ == rhs.interface_id_;
 }
 
 }  // namespace extensions