arc: Shuffle ArcAuthService's 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>
@@ skipping 115 matching lines @@
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // ArcBridgeService::Observer:
   void OnBridgeStopped(ArcBridgeService::StopReason reason) override;
 
   // InstanceHolder<mojom::AuthInstance>::Observer:
   void OnInstanceReady() override;
 
   // AuthHost:
+  void OnSignInComplete() override;
+  void OnSignInFailed(mojom::ArcSignInFailureReason reason) override;
+  void RequestAccountInfo() override;
+
+  // Deprecated methods:
   // For security reason this code can be used only once and exists for specific
   // period of time.
+  void GetAuthCodeDeprecated0(
+      const GetAuthCodeDeprecated0Callback& callback) override;
   void GetAuthCodeDeprecated(
       const GetAuthCodeDeprecatedCallback& callback) override;
-  void GetAuthCode(const GetAuthCodeCallback& callback) override;
-  void GetAuthCodeAndAccountType(
-      const GetAuthCodeAndAccountTypeCallback& callback) override;
-  void OnSignInComplete() override;
-  void OnSignInFailed(mojom::ArcSignInFailureReason reason) override;
+  void GetAuthCodeAndAccountTypeDeprecated(
+      const GetAuthCodeAndAccountTypeDeprecatedCallback& callback) override;
   // Callback is called with a bool that indicates the management status of the
   // user.
-  void GetIsAccountManaged(
-      const GetIsAccountManagedCallback& callback) override;
+  void GetIsAccountManagedDeprecated(
+      const GetIsAccountManagedDeprecatedCallback& callback) override;
 
   void OnSignInFailedInternal(ProvisioningResult result);
 
   // Called from Arc support platform app to start LSO.
   void StartLso();
 
   // Called from Arc support platform app to set auth code and start arc.
   void SetAuthCodeAndStartArc(const std::string& auth_code);
 
   // Called from Arc support platform app when user cancels signing.
@@ skipping 34 matching lines @@
 
   // Returns current page that has to be shown in OptIn UI.
   UIPage ui_page() const { return ui_page_; }
 
   // Returns current page status, relevant to the specific page.
   const base::string16& ui_page_status() const { return ui_page_status_; }
 
   ArcSupportHost* support_host() { return support_host_.get(); }
 
  private:
+  using AccountInfoCallback = base::Callback<void(mojom::AccountInfoPtr)>;
+  class AccountInfoNotifier;
+
   void StartArc();
-  // TODO: move UI methods/fields to ArcSupportHost.
+  // TODO(hidehiko): move UI methods/fields to ArcSupportHost.
   void ShowUI(UIPage page, const base::string16& status);
   void CloseUI();
   void SetUIPage(UIPage page, const base::string16& status);
   void SetState(State state);
   void ShutdownBridge();
   void ShutdownBridgeAndCloseUI();
   void ShutdownBridgeAndShowUI(UIPage page, const base::string16& status);
   void OnOptInPreferenceChanged();
   void StartUI();
   void StartAndroidManagementClient();
   void OnAndroidManagementPassed();
   void OnArcDataRemoved(bool success);
   void OnArcSignInTimeout();
   bool IsAuthCodeRequest() const;
   void FetchAuthCode();
   void PrepareContextForAuthCodeRequest();
+  void RequestAccountInfoInternal(
+      std::unique_ptr<AccountInfoNotifier> account_info_notifier);
+  void OnAccountInfoReady(mojom::AccountInfoPtr account_info);
 
   // 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);
 
   // 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_;
   std::string auth_code_;
-  GetAuthCodeCallback auth_callback_;
-  GetAuthCodeAndAccountTypeCallback auth_account_callback_;
   bool initial_opt_in_ = false;
   UIPage ui_page_ = UIPage::NO_PAGE;
   base::string16 ui_page_status_;
   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_;
 
   std::unique_ptr<ArcAuthContext> context_;
   std::unique_ptr<ArcAuthCodeFetcher> auth_code_fetcher_;
   std::unique_ptr<ArcAndroidManagementChecker> android_management_checker_;
 
   base::Time sign_in_time_;
 
   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_