Migrate opt-in auth flow to re-auth flow.

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 87 matching lines @@
   //   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,
-    FETCHING_CODE,
     ACTIVE,
   };
 
   class Observer {
    public:
     virtual ~Observer() = default;
 
     // Called to notify that ARC bridge is shut down.
     virtual void OnShutdownBridge() {}
 
@@ skipping 27 matching lines @@
   bool IsAllowed() const;
 
   void OnPrimaryUserProfilePrepared(Profile* profile);
   void Shutdown();
 
   Profile* profile() { return profile_; }
   const Profile* profile() const { return profile_; }
 
   State state() const { return state_; }
 
-  std::string GetAndResetAuthCode();
-
   // Adds or removes observers.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // ArcBridgeService::Observer:
   void OnBridgeStopped(ArcBridgeService::StopReason reason) override;
 
   // InstanceHolder<mojom::AuthInstance>::Observer:
   void OnInstanceReady() override;
 
@@ skipping 12 matching lines @@
   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;
 
   void OnSignInFailedInternal(ProvisioningResult result);
 
   // Called from Arc support platform app to set auth code and start arc.
-  void SetAuthCodeAndStartArc(const std::string& auth_code);
+  void OnAuthCodeObtained(const std::string& auth_code);
 
   // 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();
@@ skipping 43 matching lines @@
   void RemoveArcData();
 
   // Returns current page that has to be shown in OptIn UI.
   ArcSupportHost::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(); }
 
+  void StartArc();
+
  private:
   using AccountInfoCallback = base::Callback<void(mojom::AccountInfoPtr)>;
   class AccountInfoNotifier;
 
-  void StartArc();
   // TODO(hidehiko): move UI methods/fields to ArcSupportHost.
   void ShowUI(ArcSupportHost::UIPage page, const base::string16& status);
   void CloseUI();
   void SetUIPage(ArcSupportHost::UIPage page, const base::string16& status);
   void SetState(State state);
   void ShutdownBridge();
   void ShutdownBridgeAndCloseUI();
   void ShutdownBridgeAndShowUI(ArcSupportHost::UIPage page,
                                const base::string16& status);
   void OnOptInPreferenceChanged();
@@ skipping 24 matching lines @@
   // 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_;
   ArcSupportHost::UIPage ui_page_ = ArcSupportHost::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.
@@ skipping 14 matching lines @@
 
   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_