Shape detection service: Add QR detection in Mac

content/browser/renderer_host/render_process_host_impl.cc

 // Copyright 2012 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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "content/browser/renderer_host/render_process_host_impl.h"
 
 #include <algorithm>
@@ skipping 201 matching lines @@
 #include "content/browser/renderer_host/dwrite_font_proxy_message_filter_win.h"
 #include "content/common/font_cache_dispatcher_win.h"
 #include "content/common/sandbox_win.h"
 #include "sandbox/win/src/sandbox_policy.h"
 #include "ui/display/win/dpi.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "content/browser/bootstrap_sandbox_manager_mac.h"
 #include "content/browser/mach_broker_mac.h"
-#include "content/browser/shapedetection/face_detection_service_dispatcher.h"
+#include "content/browser/shapedetection/shape_detection_service_dispatcher.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "content/browser/zygote_host/zygote_communication_linux.h"
 #include "content/browser/zygote_host/zygote_host_impl_linux.h"
 #include "content/public/browser/zygote_handle_linux.h"
 #endif  // defined(OS_POSIX)
 
 #if defined(USE_OZONE)
 #include "ui/ozone/public/ozone_switches.h"
@@ skipping 960 matching lines @@
 void RenderProcessHostImpl::RegisterMojoInterfaces() {
   auto registry = base::MakeUnique<service_manager::InterfaceRegistry>(
       service_manager::mojom::kServiceManager_ConnectorSpec);
 
   channel_->AddAssociatedInterfaceForIOThread(
       base::Bind(&IndexedDBDispatcherHost::AddBinding, indexed_db_factory_));
 
 #if defined(OS_MACOSX)
   AddUIThreadInterface(
       registry.get(),
-      base::Bind(&FaceDetectionServiceDispatcher::CreateMojoService));
+      base::Bind(&ShapeDetectionServiceDispatcher::CreateFaceMojoService));
+  AddUIThreadInterface(

[Ken Rockot(use gerrit already), 2017/02/01 21:01:07]

Note that in both of these cases, trying to use the API on non-Android non-OS X
will (intentionally) crash the renderer because there won't be a registered
request handler for these interfaces. Consider registering no-op handlers for
other platforms.

[mcasas, 2017/02/02 19:40:33]

True.  What we want is, in non-Android, to route the request to 
the service, which will drop it in non-MacOsX platforms, so that
the client will be notified via its connection's |error_handler|.
Modified accordingly.

+      registry.get(),
+      base::Bind(&ShapeDetectionServiceDispatcher::CreateBarcodeMojoService));
 #endif
 
 #if defined(OS_ANDROID)
   AddUIThreadInterface(registry.get(),
                        GetGlobalJavaInterfaces()
                            ->CreateInterfaceFactory<device::BatteryMonitor>());
   AddUIThreadInterface(
       registry.get(), GetGlobalJavaInterfaces()
                           ->CreateInterfaceFactory<
                               shape_detection::mojom::FaceDetectionProvider>());
@@ skipping 1842 matching lines @@
   LOG(ERROR) << "Terminating render process for bad Mojo message: " << error;
 
   // The ReceivedBadMessage call below will trigger a DumpWithoutCrashing.
   // Capture the error message in a crash key value.
   base::debug::ScopedCrashKey error_key_value("mojo-message-error", error);
   bad_message::ReceivedBadMessage(render_process_id,
                                   bad_message::RPH_MOJO_PROCESS_ERROR);
 }
 
 }  // namespace content