Extract ArcTermsOfServiceNegotiator implementation.

chrome/browser/chromeos/arc/arc_session_manager.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_SESSION_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_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/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 arc {
 
 class ArcAndroidManagementChecker;
 class ArcAuthCodeFetcher;
 class ArcAuthContext;
-class ArcOptInPreferenceHandler;
+class ArcTermsOfServiceNegotiator;
 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 ArcSessionManager : public ArcService,
                           public ArcBridgeService::Observer,
                           public ArcSupportHost::Observer,
-                          public ArcOptInPreferenceHandlerObserver,
                           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 113 matching lines @@
   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 OnRetryClicked() override;
   void OnSendFeedbackClicked() override;
 
-  // 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(); }
 
   // TODO(hidehiko): Get rid of the getter by migration between ArcAuthContext
   // and ArcAuthCodeFetcher.
   ArcAuthContext* auth_context() { return context_.get(); }
 
   void StartArc();
 
   void OnProvisioningFinished(ProvisioningResult result);
 
  private:
-  // TODO(hidehiko): move UI methods/fields to ArcSupportHost.
+  // Negotiates the terms of service to user.
+  void StartTermsOfServiceNegotiate();

[Luis Héctor Chávez, 2016/11/29 00:15:28]

nit: StartTermsOfServiceNegotiation

[hidehiko, 2016/11/29 17:43:28]

Done.

+  void OnTermsOfServiceNegotiated(bool agreed);
+
   void SetState(State state);
   void ShutdownBridge();
   void OnOptInPreferenceChanged();
-  void StartUI();
   void OnAndroidManagementPassed();
   void OnArcDataRemoved(bool success);
   void OnArcSignInTimeout();
   void FetchAuthCode();
   void PrepareContextForAuthCodeRequest();
 
   void StartArcAndroidManagementCheck();
 
   // Called when the Android management check is done in opt-in flow or
   // re-auth flow.
@@ skipping 11 matching lines @@
   // Registrar used to monitor ARC enabled state.
   PrefChangeRegistrar pref_change_registrar_;
 
   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_;
 
-  // 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<ArcOptInPreferenceHandler> preference_handler_;
+
+  std::unique_ptr<ArcTermsOfServiceNegotiator> terms_of_service_negotiator_;
 
   std::unique_ptr<ArcAuthContext> context_;
   std::unique_ptr<ArcAndroidManagementChecker> android_management_checker_;
 
   base::Time sign_in_time_;
 
   base::WeakPtrFactory<ArcSessionManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcSessionManager);
 };
 
 // Outputs the stringified |state| to |os|. This is only for logging purposes.
 std::ostream& operator<<(std::ostream& os,
                          const ArcSessionManager::State& state);
 
 }  // namespace arc
 
 #endif  // CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_H_