| Index: extensions/common/permissions/usb_device_permission_data.cc
|
| diff --git a/extensions/common/permissions/usb_device_permission_data.cc b/extensions/common/permissions/usb_device_permission_data.cc
|
| index 532886d79ef43243234275f0ed3775e06f720002..fbd442809af7c981ce500cade41b9569d33feb03 100644
|
| --- a/extensions/common/permissions/usb_device_permission_data.cc
|
| +++ b/extensions/common/permissions/usb_device_permission_data.cc
|
| @@ -5,6 +5,7 @@
|
| #include "extensions/common/permissions/usb_device_permission_data.h"
|
|
|
| #include <string>
|
| +#include <tuple>
|
| #include <vector>
|
|
|
| #include "base/basictypes.h"
|
| @@ -90,13 +91,8 @@ bool UsbDevicePermissionData::FromValue(const base::Value* value) {
|
|
|
| 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_;
|
| + return std::tie(vendor_id_, product_id_, interface_id_) <
|
| + std::tie(rhs.vendor_id_, rhs.product_id_, rhs.interface_id_);
|
| }
|
|
|
| bool UsbDevicePermissionData::operator==(
|
|
|