Shape Detection: move Java Face detection classes to //services/shape_detection

services/shape_detection/shape_detection_service.cc

 // 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/shape_detection_service.h"
 
 #include "base/macros.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/shape_detection/barcode_detection_impl.h"
 #include "services/shape_detection/face_detection_provider_impl.h"
@@ skipping 17 matching lines @@
 
 void ShapeDetectionService::OnStart() {
   ref_factory_.reset(new service_manager::ServiceContextRefFactory(
       base::Bind(&service_manager::ServiceContext::RequestQuit,
                  base::Unretained(context()))));
 
 #if defined(OS_ANDROID)
   registry_.AddInterface(
       GetJavaInterfaces()->CreateInterfaceFactory<mojom::BarcodeDetection>());
   registry_.AddInterface(
+      GetJavaInterfaces()
+          ->CreateInterfaceFactory<mojom::FaceDetectionProvider>());
+  registry_.AddInterface(
       GetJavaInterfaces()->CreateInterfaceFactory<mojom::TextDetection>());
 #else
   registry_.AddInterface(base::Bind(&BarcodeDetectionImpl::Create));
   registry_.AddInterface(base::Bind(&TextDetectionImpl::Create));
+  registry_.AddInterface(base::Bind(&FaceDetectionProviderImpl::Create));
 #endif
-
-  registry_.AddInterface(base::Bind(&FaceDetectionProviderImpl::Create));
 }
 
 void ShapeDetectionService::OnBindInterface(
     const service_manager::BindSourceInfo& source_info,
     const std::string& interface_name,
     mojo::ScopedMessagePipeHandle interface_pipe) {
   registry_.BindInterface(source_info, interface_name,
                           std::move(interface_pipe));
 }
 
 #if defined(OS_ANDROID)
 service_manager::InterfaceProvider* ShapeDetectionService::GetJavaInterfaces() {
   if (!java_interface_provider_) {
     service_manager::mojom::InterfaceProviderPtr provider;
     Java_InterfaceRegistrar_createInterfaceRegistryForContext(
         base::android::AttachCurrentThread(),
         mojo::MakeRequest(&provider).PassMessagePipe().release().value(),
         base::android::GetApplicationContext());
     java_interface_provider_ =
         base::MakeUnique<service_manager::InterfaceProvider>();
     java_interface_provider_->Bind(std::move(provider));
   }
   return java_interface_provider_.get();
 }
 #endif
 
 }  // namespace shape_detection