Remove explicit singletonness of ArcBridgeService part 3.

chrome/browser/memory/tab_manager_delegate_chromeos.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 "chrome/browser/memory/tab_manager_delegate_chromeos.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 18 matching lines @@
 #include "chrome/browser/chromeos/arc/process/arc_process_service.h"
 #include "chrome/browser/memory/memory_kills_monitor.h"
 #include "chrome/browser/memory/tab_stats.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_features.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/arc/arc_bridge_service.h"
+#include "components/arc/arc_service_manager.h"
 #include "components/arc/common/process.mojom.h"
 #include "components/exo/shell_surface.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/zygote_host_linux.h"
 #include "ui/aura/window.h"
 #include "ui/wm/public/activation_client.h"
@@ skipping 489 matching lines @@
     candidates.emplace_back(&app);
   }
 
   // Sort candidates according to priority.
   std::sort(candidates.begin(), candidates.end());
 
   return candidates;
 }
 
 bool TabManagerDelegate::KillArcProcess(const int nspid) {
-  auto* arc_bridge_service = arc::ArcBridgeService::Get();
-  if (!arc_bridge_service)
+  auto* arc_service_manager = arc::ArcServiceManager::Get();
+  if (!arc_service_manager)
     return false;
 
   auto* arc_process_instance =
-      arc_bridge_service->process()->GetInstanceForMethod(
-          "KillProcess", kMinVersionForKillProcess);
+      arc_service_manager->arc_bridge_service()
+          ->process()
+          ->GetInstanceForMethod("KillProcess", kMinVersionForKillProcess);
   if (!arc_process_instance)
     return false;
 
   arc_process_instance->KillProcess(nspid, "LowMemoryKill");
   return true;
 }
 
 bool TabManagerDelegate::KillTab(int64_t tab_id) {
   // Check |tab_manager_| is alive before taking tabs into consideration.
   return tab_manager_ &&
@@ skipping 151 matching lines @@
     }
     priority += priority_increment;
   }
 
   if (oom_scores_to_change.size())
     GetDebugDaemonClient()->SetOomScoreAdj(
         oom_scores_to_change, base::Bind(&OnSetOomScoreAdj));
 }
 
 }  // namespace memory