RELAND: Shape detection unittests mac (QR and Face) in GPU bots

services/shape_detection/barcode_detection_impl_mac.mm

 // Copyright 2017 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 "services/shape_detection/barcode_detection_impl_mac.h"
 
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 24 matching lines @@
 void BarcodeDetectionImpl::Create(
     shape_detection::mojom::BarcodeDetectionRequest request) {
   // Barcode detection needs at least MAC OS X 10.10.
   if (!base::mac::IsAtLeastOS10_10())
     return;
   mojo::MakeStrongBinding(base::MakeUnique<BarcodeDetectionImplMac>(),
                           std::move(request));
 }
 
 BarcodeDetectionImplMac::BarcodeDetectionImplMac() {
-  NSDictionary* const opts = @{CIDetectorAccuracy : CIDetectorAccuracyHigh};
+  NSDictionary* const options = @{CIDetectorAccuracy : CIDetectorAccuracyHigh};
   detector_.reset([[CIDetector detectorOfType:CIDetectorTypeQRCode
                                       context:nil
-                                      options:opts] retain]);
+                                      options:options] retain]);
 }
 
 BarcodeDetectionImplMac::~BarcodeDetectionImplMac() {}
 
 void BarcodeDetectionImplMac::Detect(mojo::ScopedSharedBufferHandle frame_data,
                                      uint32_t width,
                                      uint32_t height,
                                      const DetectCallback& callback) {
   media::ScopedResultCallback<DetectCallback> scoped_callback(
       base::Bind(&RunCallbackWithBarcodes, callback),
@@ skipping 26 matching lines @@
                                        height - f.bottomRight.y);
     result->corner_points.emplace_back(f.bottomLeft.x, height - f.bottomLeft.y);
 
     result->raw_value = base::SysNSStringToUTF8(f.messageString);
     results.push_back(std::move(result));
   }
   scoped_callback.Run(std::move(results));
 }
 
 }  // namespace shape_detection