arc: Revamp the ArcBridgeService interface

chrome/browser/chromeos/arc/arc_process_service.cc

 // Copyright 2016 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.
 //
 // The main point of this class is to cache ARC proc nspid<->pid mapping
 // globally. Since the calculation is costly, a dedicated worker thread is
 // used. All read/write of its internal data structure (i.e., the mapping)
 // should be on this thread.
 
 #include "chrome/browser/chromeos/arc/arc_process_service.h"
@@ skipping 25 matching lines @@
 using base::SequencedWorkerPool;
 using std::map;
 using std::set;
 using std::vector;
 
 ArcProcessService::ArcProcessService(ArcBridgeService* bridge_service)
     : ArcService(bridge_service),
       worker_pool_(new SequencedWorkerPool(1, "arc_process_manager")),
       weak_ptr_factory_(this) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  arc_bridge_service()->AddObserver(this);
+  arc_bridge_service()->process()->AddObserver(this);
   DCHECK(!g_arc_process_service);
   g_arc_process_service = this;
   // Not intended to be used from the creating thread.
   thread_checker_.DetachFromThread();
 }
 
 ArcProcessService::~ArcProcessService() {
   DCHECK(g_arc_process_service == this);
   g_arc_process_service = nullptr;
-  arc_bridge_service()->RemoveObserver(this);
+  arc_bridge_service()->process()->RemoveObserver(this);
   worker_pool_->Shutdown();
 }
 
 // static
 ArcProcessService* ArcProcessService::Get() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   return g_arc_process_service;
 }
 
-void ArcProcessService::OnProcessInstanceReady() {
+void ArcProcessService::OnInstanceReady() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   worker_pool_->PostNamedSequencedWorkerTask(
       kSequenceToken,
       FROM_HERE,
       base::Bind(&ArcProcessService::Reset,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ArcProcessService::Reset() {
   DCHECK(thread_checker_.CalledOnValidThread());
   nspid_to_pid_.clear();
 }
 
 bool ArcProcessService::RequestProcessList(
     RequestProcessListCallback callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   arc::mojom::ProcessInstance* process_instance =
-      arc_bridge_service()->process_instance();
+      arc_bridge_service()->process()->instance();
   if (!process_instance) {
     return false;
   }
   process_instance->RequestProcessList(
       base::Bind(&ArcProcessService::OnReceiveProcessList,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback));
   return true;
 }
 
@@ skipping 146 matching lines @@
           nspid_to_pid_.find(nspid) != nspid_to_pid_.end())
         nspid_to_pid_[nspid] = pid;
 
       for (ProcessId child_pid : process_tree[pid])
         queue.push(child_pid);
     }
   }
 }
 
 }  // namespace arc