arc: Revamp the ArcBridgeService interface

chrome/browser/chromeos/arc/arc_auth_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_
 
 #include <memory>
 #include <ostream>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/arc/arc_android_management_checker_delegate.h"
 #include "chrome/browser/chromeos/arc/arc_auth_context_delegate.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service.h"
 #include "components/arc/common/auth.mojom.h"
+#include "components/arc/instance_holder.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/syncable_prefs/pref_service_syncable_observer.h"
 #include "components/syncable_prefs/synced_pref_observer.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 class ArcAppLauncher;
 class Profile;
 
 namespace ash {
 class ShelfDelegate;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace arc {
 
 class ArcAndroidManagementChecker;
 class ArcAuthContext;
 
 // This class proxies the request from the client to fetch an auth code from
 // LSO.
 class ArcAuthService : public ArcService,
                        public mojom::AuthHost,
                        public ArcBridgeService::Observer,
+                       public InstanceHolder<mojom::AuthInstance>::Observer,
                        public ArcAndroidManagementCheckerDelegate,
                        public ArcAuthContextDelegate,
                        public syncable_prefs::PrefServiceSyncableObserver,
                        public syncable_prefs::SyncedPrefObserver {
  public:
   enum class State {
     NOT_INITIALIZED,  // Service is not initialized.
     STOPPED,          // ARC is not running.
     FETCHING_CODE,    // ARC may be running or not. Auth code is fetching.
     ACTIVE,           // ARC is running.
@@ skipping 58 matching lines @@
 
   State state() const { return state_; }
 
   std::string GetAndResetAuthCode();
 
   // Adds or removes observers.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // ArcBridgeService::Observer:
-  void OnAuthInstanceReady() override;
   void OnBridgeStopped(ArcBridgeService::StopReason reason) override;
 
+  // InstanceHolder<mojom::AuthInstance>::Observer:
+  void OnInstanceReady() override;
+
   // AuthHost:
   // For security reason this code can be used only once and exists for specific
   // period of time.
   void GetAuthCodeDeprecated(
       const GetAuthCodeDeprecatedCallback& callback) override;
   void GetAuthCode(const GetAuthCodeCallback& callback) override;
   void OnSignInComplete() override;
   void OnSignInFailed(arc::mojom::ArcSignInFailureReason reason) override;
   // Callback is called with a bool that indicates the management status of the
   // user.
@@ skipping 77 matching lines @@
   base::WeakPtrFactory<ArcAuthService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcAuthService);
 };
 
 std::ostream& operator<<(std::ostream& os, const ArcAuthService::State& state);
 
 }  // namespace arc
 
 #endif  // CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_