From e684a3455bcc29a6e3e66a004e352dea4e1141e7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 13 Feb 2019 15:05:36 +0100 Subject: BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922 Reviewed-by: Michael Brüning --- chromium/services/shape_detection/shape_detection_service.cc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'chromium/services/shape_detection/shape_detection_service.cc') diff --git a/chromium/services/shape_detection/shape_detection_service.cc b/chromium/services/shape_detection/shape_detection_service.cc index 53f59446dde..60403a4be14 100644 --- a/chromium/services/shape_detection/shape_detection_service.cc +++ b/chromium/services/shape_detection/shape_detection_service.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/macros.h" -#include "services/service_manager/public/cpp/service_context.h" #if defined(OS_WIN) #include "services/shape_detection/barcode_detection_provider_impl.h" #include "services/shape_detection/face_detection_provider_win.h" @@ -30,11 +29,9 @@ namespace shape_detection { -std::unique_ptr ShapeDetectionService::Create() { - return std::make_unique(); -} - -ShapeDetectionService::ShapeDetectionService() { +ShapeDetectionService::ShapeDetectionService( + service_manager::mojom::ServiceRequest request) + : service_binding_(this, std::move(request)) { #if defined(OS_MACOSX) if (__builtin_available(macOS 10.13, *)) { vision_framework_ = @@ -53,9 +50,6 @@ ShapeDetectionService::~ShapeDetectionService() { } void ShapeDetectionService::OnStart() { - ref_factory_.reset(new service_manager::ServiceContextRefFactory( - context()->CreateQuitClosure())); - #if defined(OS_ANDROID) registry_.AddInterface( GetJavaInterfaces() -- cgit v1.2.1