| Index: extensions/common/api/printer_provider/usb_printer_manifest_data.cc
|
| diff --git a/extensions/common/api/printer_provider/usb_printer_manifest_data.cc b/extensions/common/api/printer_provider/usb_printer_manifest_data.cc
|
| index 919364ebcc40090003f0a51d7c09f9175c162c4e..d8480139edc6dadf7bccb3fb16d3ac0305662baf 100644
|
| --- a/extensions/common/api/printer_provider/usb_printer_manifest_data.cc
|
| +++ b/extensions/common/api/printer_provider/usb_printer_manifest_data.cc
|
| @@ -39,23 +39,22 @@ scoped_ptr<UsbPrinterManifestData> UsbPrinterManifestData::FromValue(
|
|
|
| scoped_ptr<UsbPrinterManifestData> result(new UsbPrinterManifestData());
|
| for (const auto& input : usb_printers->filters) {
|
| - DCHECK(input.get());
|
| UsbDeviceFilter output;
|
| - output.SetVendorId(input->vendor_id);
|
| - if (input->product_id && input->interface_class) {
|
| + output.SetVendorId(input.vendor_id);
|
| + if (input.product_id && input.interface_class) {
|
| *error = base::ASCIIToUTF16(
|
| "Only one of productId or interfaceClass may be specified.");
|
| return nullptr;
|
| }
|
| - if (input->product_id) {
|
| - output.SetProductId(*input->product_id);
|
| + if (input.product_id) {
|
| + output.SetProductId(*input.product_id);
|
| }
|
| - if (input->interface_class) {
|
| - output.SetInterfaceClass(*input->interface_class);
|
| - if (input->interface_subclass) {
|
| - output.SetInterfaceSubclass(*input->interface_subclass);
|
| - if (input->interface_protocol) {
|
| - output.SetInterfaceProtocol(*input->interface_protocol);
|
| + if (input.interface_class) {
|
| + output.SetInterfaceClass(*input.interface_class);
|
| + if (input.interface_subclass) {
|
| + output.SetInterfaceSubclass(*input.interface_subclass);
|
| + if (input.interface_protocol) {
|
| + output.SetInterfaceProtocol(*input.interface_protocol);
|
| }
|
| }
|
| }
|
|
|