Split ArcSessionManager from ArcAuthService.

chrome/browser/chromeos/arc/arc_auth_service.h

Index: chrome/browser/chromeos/arc/arc_auth_service.h
diff --git a/chrome/browser/chromeos/arc/arc_auth_service.h b/chrome/browser/chromeos/arc/arc_auth_service.h
index 5a192fc3ff57cf64f1244c3810dd2e27f23c2de2..0b525bd864451c3606bbdd3780c47c0bb152d216 100644
--- a/chrome/browser/chromeos/arc/arc_auth_service.h
+++ b/chrome/browser/chromeos/arc/arc_auth_service.h
@@ -6,159 +6,45 @@
 #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 "base/timer/timer.h"
 #include "chrome/browser/chromeos/arc/arc_support_host.h"
-#include "chrome/browser/chromeos/arc/optin/arc_optin_preference_handler_observer.h"
-#include "chrome/browser/chromeos/policy/android_management_client.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/sync_preferences/pref_service_syncable_observer.h"
-#include "components/sync_preferences/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 net {
+class URLRequestContextGetter;
 }
 
 namespace arc {
 
-class ArcAndroidManagementChecker;
 class ArcAuthCodeFetcher;
 class ArcAuthContext;
-class ArcOptInPreferenceHandler;
 class ArcRobotAuth;
-enum class ProvisioningResult : int;
 
-// This class proxies the request from the client to fetch an auth code from
-// LSO. It lives on the UI thread.
+// Implementation of ARC authorization.
+// TODO(hidehiko): Move to c/b/c/arc/auth with adding tests.
 class ArcAuthService : public ArcService,
                        public mojom::AuthHost,
-                       public ArcBridgeService::Observer,
                        public InstanceHolder<mojom::AuthInstance>::Observer,
-                       public ArcSupportHost::Observer,
-                       public ArcOptInPreferenceHandlerObserver,
-                       public sync_preferences::PrefServiceSyncableObserver,
-                       public sync_preferences::SyncedPrefObserver {
+                       public ArcSupportHost::Observer {
  public:
-  // Represents each State of ARC session.
-  // NOT_INITIALIZED: represents the state that the Profile is not yet ready
-  //   so that this service is not yet initialized, or Chrome is being shut
-  //   down so that this is destroyed.
-  // STOPPED: ARC session is not running, or being terminated.
-  // SHOWING_TERMS_OF_SERVICE: "Terms Of Service" page is shown on ARC support
-  //   Chrome app.
-  // CHECKING_ANDROID_MANAGEMENT: Checking Android management status. Note that
-  //   the status is checked for each ARC session starting, but this is the
-  //   state only for the first boot case (= opt-in case). The second time and
-  //   later the management check is running in parallel with ARC session
-  //   starting, and in such a case, State is ACTIVE, instead.
-  // FETCHING_CODE: Fetching an auth token. Similar to
-  //   CHECKING_ANDROID_MANAGEMENT case, this is only for the first boot case.
-  //   In re-auth flow (fetching an auth token while ARC is running), the
-  //   State should be ACTIVE.
-  //   TODO(hidehiko): Migrate into re-auth flow, then remove this state.
-  // ACTIVE: ARC is running.
-  //
-  // State transition should be as follows:
-  //
-  // NOT_INITIALIZED -> STOPPED: when the primary Profile gets ready.
-  // ...(any)... -> NOT_INITIALIZED: when the Chrome is being shutdown.
-  // ...(any)... -> STOPPED: on error.
-  //
-  // In the first boot case (no OOBE case):
-  //   STOPPED -> SHOWING_TERMS_OF_SERVICE: when arc.enabled preference is set.
-  //   SHOWING_TERMS_OF_SERVICE -> CHECKING_ANDROID_MANAGEMENT: when a user
-  //     agree with "Terms Of Service"
-  //   CHECKING_ANDROID_MANAGEMENT -> FETCHING_CODE: when Android management
-  //     check passes.
-  //   FETCHING_CODE -> ACTIVE: when the auth token is successfully fetched.
-  //
-  // In the first boot case (OOBE case):
-  //   STOPPED -> FETCHING_CODE: When arc.enabled preference is set.
-  //   FETCHING_CODE -> ACTIVE: when the auth token is successfully fetched.
-  //
-  // In the second (or later) boot case:
-  //   STOPPED -> ACTIVE: when arc.enabled preference is checked that it is
-  //     true. Practically, this is when the primary Profile gets ready.
-  enum class State {
-    NOT_INITIALIZED,
-    STOPPED,
-    SHOWING_TERMS_OF_SERVICE,
-    CHECKING_ANDROID_MANAGEMENT,
-    ACTIVE,
-  };
-
-  class Observer {
-   public:
-    virtual ~Observer() = default;
-
-    // Called to notify that ARC bridge is shut down.
-    virtual void OnShutdownBridge() {}
-
-    // Called to notify that ARC enabled state has been updated.
-    virtual void OnOptInEnabled(bool enabled) {}
-
-    // Called to notify that ARC has been initialized successfully.
-    virtual void OnInitialStart() {}
-  };
-
   explicit ArcAuthService(ArcBridgeService* bridge_service);
   ~ArcAuthService() override;
 
-  static ArcAuthService* Get();
-
-  // It is called from chrome/browser/prefs/browser_prefs.cc.
-  static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
-
-  static void DisableUIForTesting();
-  static void SetShelfDelegateForTesting(ash::ShelfDelegate* shelf_delegate);
-
-  // Checks if OptIn verification was disabled by switch in command line.
-  static bool IsOptInVerificationDisabled();
-
-  static void EnableCheckAndroidManagementForTesting();
-
-  // Returns true if Arc is allowed to run for the given profile.
-  static bool IsAllowedForProfile(const Profile* profile);
-
-  // Returns true if Arc is allowed to run for the current session.
-  bool IsAllowed() const;
-
-  void OnPrimaryUserProfilePrepared(Profile* profile);
-  void Shutdown();
-
-  Profile* profile() { return profile_; }
-  const Profile* profile() const { return profile_; }
-
-  State state() const { return state_; }
-
-  // Adds or removes observers.
-  void AddObserver(Observer* observer);
-  void RemoveObserver(Observer* observer);
-
-  // ArcBridgeService::Observer:
-  void OnBridgeStopped(ArcBridgeService::StopReason reason) override;
+  // This is introduced to work with existing tests.
+  // TODO(crbug.com/664095): Clean up the test and remove this method.
+  static ArcAuthService* GetForTest();
 
   // InstanceHolder<mojom::AuthInstance>::Observer:
   void OnInstanceReady() override;
+  void OnInstanceClosed() override;
 
-  // AuthHost:
+  // mojom::AuthHost:
   void OnSignInComplete() override;
   void OnSignInFailed(mojom::ArcSignInFailureReason reason) override;
   void RequestAccountInfo() override;
@@ -172,79 +58,24 @@ class ArcAuthService : public ArcService,
       const GetAuthCodeDeprecatedCallback& callback) override;
   void GetAuthCodeAndAccountTypeDeprecated(
       const GetAuthCodeAndAccountTypeDeprecatedCallback& callback) override;
-  // Callback is called with a bool that indicates the management status of the
-  // user.
   void GetIsAccountManagedDeprecated(
       const GetIsAccountManagedDeprecatedCallback& callback) override;
 
-  // Called from Arc support platform app when user cancels signing.
-  void CancelAuthCode();
-
-  bool IsArcManaged() const;
-  bool IsArcEnabled() const;
-
-  // This requires Arc to be allowed (|IsAllowed|)for current profile.
-  void EnableArc();
-  void DisableArc();
-
-  // Called from the Chrome OS metrics provider to record Arc.State
-  // periodically.
-  void RecordArcState();
-
-  // sync_preferences::PrefServiceSyncableObserver
-  void OnIsSyncingChanged() override;
-
-  // sync_preferences::SyncedPrefObserver
-  void OnSyncedPrefChanged(const std::string& path, bool from_sync) override;
-
   // ArcSupportHost::Observer:
-  void OnWindowClosed() override;
-  void OnTermsAgreed(bool is_metrics_enabled,
-                     bool is_backup_and_restore_enabled,
-                     bool is_location_service_enabled) override;
   void OnAuthSucceeded(const std::string& auth_code) override;
   void OnRetryClicked() override;
-  void OnSendFeedbackClicked() override;
-
-  // arc::ArcOptInPreferenceHandlerObserver:
-  void OnMetricsModeChanged(bool enabled, bool managed) override;
-  void OnBackupAndRestoreModeChanged(bool enabled, bool managed) override;
-  void OnLocationServicesModeChanged(bool enabled, bool managed) override;
-
-  // Stops ARC without changing ArcEnabled preference.
-  void StopArc();
-
-  // StopArc(), then EnableArc(). Between them data clear may happens.
-  // This is a special method to support enterprise device lost case.
-  // This can be called only when ARC is running.
-  void StopAndEnableArc();
-
-  // Removes the data if ARC is stopped. Otherwise, queue to remove the data
-  // on ARC is stopped.
-  void RemoveArcData();
-
-  ArcSupportHost* support_host() { return support_host_.get(); }
-
-  void StartArc();
-
-  void OnProvisioningFinished(ProvisioningResult result);
 
  private:
   using AccountInfoCallback = base::Callback<void(mojom::AccountInfoPtr)>;
   class AccountInfoNotifier;
 
-  // TODO(hidehiko): move UI methods/fields to ArcSupportHost.
-  void SetState(State state);
-  void ShutdownBridge();
-  void OnOptInPreferenceChanged();
-  void StartUI();
-  void OnAndroidManagementPassed();
-  void OnArcDataRemoved(bool success);
-  void OnArcSignInTimeout();
-  void FetchAuthCode();
-  void PrepareContextForAuthCodeRequest();
+  // Starts to request account info.
   void RequestAccountInfoInternal(
       std::unique_ptr<AccountInfoNotifier> account_info_notifier);
+
+  // Called when HTTP context is prepared.
+  void OnContextPrepared(net::URLRequestContextGetter* request_context_getter);
+
   void OnAccountInfoReady(mojom::AccountInfoPtr account_info);
 
   // Callback for Robot auth in Kiosk mode.
@@ -258,60 +89,19 @@ class ArcAuthService : public ArcService,
   // fetching, and Robot auth.
   void OnAuthCodeObtained(const std::string& auth_code);
 
-  void StartArcAndroidManagementCheck();
-
-  // Called when the Android management check is done in opt-in flow or
-  // re-auth flow.
-  void OnAndroidManagementChecked(
-      policy::AndroidManagementClient::Result result);
-
-  // Called when the background Android management check is done. It is
-  // triggered when the second or later ARC boot timing.
-  void OnBackgroundAndroidManagementChecked(
-      policy::AndroidManagementClient::Result result);
-
-  // Called when HTTP context is prepared.
-  void OnContextPrepared(net::URLRequestContextGetter* request_context_getter);
-
-  // Unowned pointer. Keeps current profile.
-  Profile* profile_ = nullptr;
-
-  // Registrar used to monitor ARC enabled state.
-  PrefChangeRegistrar pref_change_registrar_;
-
-  mojo::Binding<AuthHost> binding_;
-  State state_ = State::NOT_INITIALIZED;
-  base::ObserverList<Observer> observer_list_;
-  std::unique_ptr<ArcAppLauncher> playstore_launcher_;
-  bool clear_required_ = false;
-  bool reenable_arc_ = false;
-  base::OneShotTimer arc_sign_in_timer_;
-
-  // Notifies the correct callback whenever the auth_code is ready.
-  std::unique_ptr<AccountInfoNotifier> account_info_notifier_;
-
-  // Temporarily keeps the ArcSupportHost instance.
-  // This should be moved to ArcSessionManager when the refactoring is
-  // done.
-  std::unique_ptr<ArcSupportHost> support_host_;
-  // Handles preferences and metrics mode.
-  std::unique_ptr<arc::ArcOptInPreferenceHandler> preference_handler_;
+  mojo::Binding<mojom::AuthHost> binding_;
 
   std::unique_ptr<ArcAuthContext> context_;
   std::unique_ptr<ArcAuthCodeFetcher> auth_code_fetcher_;
-  std::unique_ptr<ArcAndroidManagementChecker> android_management_checker_;
   std::unique_ptr<ArcRobotAuth> arc_robot_auth_;
 
-  base::Time sign_in_time_;
+  std::unique_ptr<AccountInfoNotifier> notifier_;
 
   base::WeakPtrFactory<ArcAuthService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcAuthService);
 };
 
-// Outputs the stringified |state| to |os|. This is only for logging purposes.
-std::ostream& operator<<(std::ostream& os, const ArcAuthService::State& state);
-
 }  // namespace arc
 
 #endif  // CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_