Remove delegates from ArcAuthCodeFetcher and ArcAuthContext.

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 "base/timer/timer.h"
-#include "chrome/browser/chromeos/arc/arc_auth_code_fetcher_delegate.h"
-#include "chrome/browser/chromeos/arc/arc_auth_context_delegate.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"
@@ skipping 20 matching lines @@
 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.
 class ArcAuthService : public ArcService,
                        public mojom::AuthHost,
                        public ArcBridgeService::Observer,
                        public InstanceHolder<mojom::AuthInstance>::Observer,
                        public ArcSupportHost::Observer,
                        public ArcOptInPreferenceHandlerObserver,
-                       public ArcAuthContextDelegate,
-                       public ArcAuthCodeFetcherDelegate,
                        public sync_preferences::PrefServiceSyncableObserver,
                        public sync_preferences::SyncedPrefObserver {
  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.
@@ skipping 104 matching lines @@
       const GetAuthCodeDeprecated0Callback& callback) override;
   void GetAuthCodeDeprecated(
       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 to set auth code and start arc.
-  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();
 
   // 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;
 
-  // ArcAuthContextDelegate:
-  void OnContextReady() override;
-  void OnPrepareContextFailed() override;
-
-  // ArcAuthCodeFetcherDelegate:
-  void OnAuthCodeSuccess(const std::string& auth_code) override;
-  void OnAuthCodeFailed() 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:
@@ skipping 24 matching lines @@
   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();
-  bool IsAuthCodeRequest() const;
   void FetchAuthCode();
   void PrepareContextForAuthCodeRequest();
   void RequestAccountInfoInternal(
       std::unique_ptr<AccountInfoNotifier> account_info_notifier);
   void OnAccountInfoReady(mojom::AccountInfoPtr account_info);
+
+  // Callback for Robot auth in Kiosk mode.
   void OnRobotAuthCodeFetched(const std::string& auth_code);
 
+  // Callback for automatic auth code fetching when --arc-user-auth-endpoint
+  // flag is set.
+  void OnAuthCodeFetched(const std::string& auth_code);
+
+  // Common procedure across LSO auth code fetching, automatic auth code
+  // 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(
@@ skipping 34 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_