[GRC] Process Coordination Unit support for Global Resource Controller

services/resource_coordinator/public/cpp/resource_coordinator_interface.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/resource_coordinator/public/cpp/resource_coordinator_interface.h"
 
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/resource_coordinator/public/interfaces/coordination_unit_provider.mojom.h"
 #include "services/resource_coordinator/public/interfaces/service_constants.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 
 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);
 }
 
 }  // namespace
 
 namespace resource_coordinator {
 
 ResourceCoordinatorInterface::ResourceCoordinatorInterface(
     service_manager::Connector* connector,
-    const CoordinationUnitType& type)
-    : weak_ptr_factory_(this) {
-  ConnectToService(connector, type, std::string());
-}
-
-ResourceCoordinatorInterface::ResourceCoordinatorInterface(
-    service_manager::Connector* connector,
     const CoordinationUnitType& type,
     const std::string& id)
     : weak_ptr_factory_(this) {
-  ConnectToService(connector, type, id);
+  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,
+    uint64_t id)
+    : weak_ptr_factory_(this) {
+  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));
 }
 
 void ResourceCoordinatorInterface::SendEvent(
     const mojom::EventType& event_type) {
   DCHECK(thread_checker_.CalledOnValidThread());
   mojom::EventPtr event = mojom::Event::New();
   event->type = event_type;
 
@@ skipping 10 matching lines @@
                                     weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ResourceCoordinatorInterface::AddChildByID(
     const CoordinationUnitID& child_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   service_->AddChild(child_id);
 }
 
 }  // namespace resource_coordinator