ShapeDetection: add support for Text Detection in Mac

services/service_manager/service_manager.cc

 // Copyright 2014 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/service_manager/service_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 181 matching lines @@
     Instance* source =
         service_manager_->GetExistingInstance(params->source());
     if (source) {
       source_specs = source->interface_provider_specs_;
       source_connection_spec = source->GetConnectionSpec();
     }
 
     InterfaceSet exposed = GetInterfacesToExpose(source_connection_spec,
                                                  identity_,
                                                  GetConnectionSpec());
-    bool allowed = (exposed.size() == 1 && exposed.count("*") == 1) ||
-        exposed.count(params->interface_name()) > 0;
+    const bool allowed = (exposed.size() == 1 && exposed.count("*") == 1) ||

[Reilly Grant (use Gerrit), 2017/03/02 22:10:26]

This seems like an unrelated and unnecessary change.

[mcasas, 2017/03/02 23:27:50]

Done.

+                         exposed.count(params->interface_name()) > 0;
     if (!allowed) {
       std::stringstream ss;
       ss << "Connection InterfaceProviderSpec prevented service: "
          << params->source().name() << " from binding interface: "
          << params->interface_name() << " exposed by: " << identity_.name();
       LOG(ERROR) << ss.str();
       params->bind_interface_callback().Run(mojom::ConnectResult::ACCESS_DENIED,
                                             identity_.user_id());
       return false;
     }
@@ skipping 849 matching lines @@
     bool connected = instance->CallOnConnect(&params);
     DCHECK(connected);
   }
 }
 
 base::WeakPtr<ServiceManager> ServiceManager::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 }  // namespace service_manager