arc: Revamp the ArcBridgeService interface

chrome/browser/task_management/providers/arc/arc_process_task.h

 // 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.
 
 #ifndef CHROME_BROWSER_TASK_MANAGEMENT_PROVIDERS_ARC_ARC_PROCESS_TASK_H_
 #define CHROME_BROWSER_TASK_MANAGEMENT_PROVIDERS_ARC_ARC_PROCESS_TASK_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/task_management/providers/task.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/common/process.mojom.h"
+#include "components/arc/instance_holder.h"
 #include "components/arc/intent_helper/activity_icon_loader.h"
 
 namespace task_management {
 
 // Defines a task that represents an ARC process.
-class ArcProcessTask : public Task, public arc::ArcBridgeService::Observer {
+class ArcProcessTask
+    : public Task,
+      public arc::InstanceHolder<arc::mojom::IntentHelperInstance>::Observer {
  public:
   ArcProcessTask(base::ProcessId pid,
                  base::ProcessId nspid,
                  const std::string& process_name,
                  arc::mojom::ProcessState process_state,
                  const std::vector<std::string>& packages);
   ~ArcProcessTask() override;
 
   // task_management::Task:
   Type GetType() const override;
   int GetChildProcessUniqueID() const override;
   bool IsKillable() override;
   void Kill() override;
 
-  // arc::ArcBridgeService::Observer:
-  void OnIntentHelperInstanceReady() override;
+  // arc::InstanceHolder<arc::mojom::IntentHelperInstance>::Observer:
+  void OnInstanceReady() override;
 
   void SetProcessState(arc::mojom::ProcessState process_state);
 
   base::ProcessId nspid() const { return nspid_; }
   const std::string& process_name() const { return process_name_; }
 
  private:
   void StartIconLoading();
   void OnIconLoaded(
       std::unique_ptr<arc::ActivityIconLoader::ActivityToIconsMap> icons);
 
   const base::ProcessId nspid_;
   const std::string process_name_;
   arc::mojom::ProcessState process_state_;
   const std::string package_name_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<ArcProcessTask> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcProcessTask);
 };
 
 }  // namespace task_management
 
 #endif  // CHROME_BROWSER_TASK_MANAGEMENT_PROVIDERS_ARC_ARC_PROCESS_TASK_H_