[GRC] Process Coordination Unit support for Global Resource Controller

services/resource_coordinator/public/cpp/resource_coordinator_interface.cc

Index: services/resource_coordinator/public/cpp/resource_coordinator_interface.cc
diff --git a/services/resource_coordinator/public/cpp/resource_coordinator_interface.cc b/services/resource_coordinator/public/cpp/resource_coordinator_interface.cc
index 7e25a5c816dfd7743ef356a149d4375c926e61bc..c981affbc8166dbe510c3419f72da2979012e9d7 100644
--- a/services/resource_coordinator/public/cpp/resource_coordinator_interface.cc
+++ b/services/resource_coordinator/public/cpp/resource_coordinator_interface.cc
@@ -12,6 +12,7 @@
 namespace {
 
 void OnConnectionError() {
+  LOG(ERROR) << "OnConnectionError";

[oystein (OOO til 10th of July), 2017/05/17 23:06:07]

Leftover log line?

[matthalp, 2017/05/18 16:13:46]

Done.

   DCHECK(false);
 }
 
@@ -21,33 +22,38 @@ namespace resource_coordinator {
 
 ResourceCoordinatorInterface::ResourceCoordinatorInterface(
     service_manager::Connector* connector,
-    const CoordinationUnitType& type)
+    const CoordinationUnitType& type,
+    const std::string& id)
     : weak_ptr_factory_(this) {
-  ConnectToService(connector, type, std::string());
+  CoordinationUnitID new_cu_id(type, id);
+  ConnectToService(connector, new_cu_id);
 }
 
 ResourceCoordinatorInterface::ResourceCoordinatorInterface(
     service_manager::Connector* connector,
+    const CoordinationUnitType& type)
+    : ResourceCoordinatorInterface(connector, type, std::string()) {}
+
+ResourceCoordinatorInterface::ResourceCoordinatorInterface(
+    service_manager::Connector* connector,
     const CoordinationUnitType& type,
-    const std::string& id)
+    uint64_t id)
     : weak_ptr_factory_(this) {
-  ConnectToService(connector, type, id);
+  CoordinationUnitID new_cu_id(type, id);
+  ConnectToService(connector, new_cu_id);
 }
 
 ResourceCoordinatorInterface::~ResourceCoordinatorInterface() = default;
 
 void ResourceCoordinatorInterface::ConnectToService(
     service_manager::Connector* connector,
-    const CoordinationUnitType& type,
-    const std::string& id) {
+    const CoordinationUnitID& cu_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(connector);
   mojom::CoordinationUnitProviderPtr provider;
   connector->BindInterface(mojom::kServiceName, mojo::MakeRequest(&provider));
 
-  CoordinationUnitID new_cu_id(type, id);
-
-  provider->CreateCoordinationUnit(mojo::MakeRequest(&service_), new_cu_id);
+  provider->CreateCoordinationUnit(mojo::MakeRequest(&service_), cu_id);
 
   service_.set_connection_error_handler(base::Bind(&OnConnectionError));
 }