arc: Provide a per-service getter for ArcServiceManager

components/arc/arc_service_manager.cc

 // Copyright 2015 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 "components/arc/arc_service_manager.h"
 
-#include <utility>
-
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/task_runner.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_session.h"
 #include "components/arc/arc_session_runner.h"
 #include "components/arc/intent_helper/arc_intent_helper_observer.h"
 
 namespace arc {
 namespace {
@@ skipping 49 matching lines @@
     return nullptr;
   DCHECK(g_arc_service_manager->thread_checker_.CalledOnValidThread());
   return g_arc_service_manager;
 }
 
 ArcBridgeService* ArcServiceManager::arc_bridge_service() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return arc_bridge_service_.get();
 }
 
-void ArcServiceManager::AddService(std::unique_ptr<ArcService> service) {
+bool ArcServiceManager::AddServiceInternal(
+    const std::string& name,
+    std::unique_ptr<ArcService> service) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  services_.emplace_back(std::move(service));
+  if (!name.empty() && services_.count(name) != 0) {
+    LOG(ERROR) << "Ignoring registration of service with duplicate name: "
+               << name;
+    return false;
+  }
+  services_.insert(std::make_pair(name, std::move(service)));
+  return true;
+}
+
+ArcService* ArcServiceManager::GetNamedServiceInternal(
+    const std::string& name) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(!name.empty());

[Yusuke Sato, 2017/01/10 19:30:57]

This may actually happen by developer's mistake. LOG(ERROR) and return nullptr,
maybe with a unit test, might make developers' life easier?

[Luis Héctor Chávez, 2017/01/10 23:48:09]

The only way that is possible is if they would set an empty string as the name.
Hopefully we catch those at review-time but Done.

+  auto service = services_.find(name);
+  if (service == services_.end()) {
+    LOG(ERROR) << "Named service " << name << " not found";
+    return nullptr;
+  }
+  return service->second.get();
 }
 
 void ArcServiceManager::AddObserver(Observer* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   observer_list_.AddObserver(observer);
 }
 
 void ArcServiceManager::RemoveObserver(Observer* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   observer_list_.RemoveObserver(observer);
 }
 
 void ArcServiceManager::Shutdown() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Before actual shutdown, notify observers for clean up.
   for (auto& observer : observer_list_)
     observer.OnArcShutdown();
 
   icon_loader_ = nullptr;
   activity_resolver_ = nullptr;
   services_.clear();
 }
 
 }  // namespace arc