Revert of Add CheckAndroidManagement to ARC sign-in 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>
 
 #include "base/macros.h"
-#include "base/memory/weak_ptr.h"
 #include "base/observer_list.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/prefs/pref_change_registrar.h"
 #include "components/syncable_prefs/pref_service_syncable_observer.h"
 #include "components/syncable_prefs/synced_pref_observer.h"
+#include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/ubertoken_fetcher.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 class ArcAppLauncher;
 class GaiaAuthFetcher;
 class Profile;
-class ProfileOAuth2TokenService;
 
 namespace content {
 class StoragePartition;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace user_prefs {
@@ skipping 32 matching lines @@
     virtual ~Observer() = default;
 
     // Called whenever Opt-In state of the ARC has been changed.
     virtual void OnOptInChanged(State state) {}
 
     // Called to notify that OptIn UI needs to be closed.
     virtual void OnOptInUIClose() {}
 
     // Called to notify that OptIn UI needs to show specific page.
     virtual void OnOptInUIShowPage(UIPage page, const base::string16& status) {}
-
-    // Called to notify that ARC bridge is shut down.
-    virtual void OnShutdownBridge() {}
   };
 
   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();
 
   // Checks if OptIn verification was disabled by switch in command line.
   static bool IsOptInVerificationDisabled();
 
-  static void EnableCheckAndroidManagementForTesting();
-
   void OnPrimaryUserProfilePrepared(Profile* profile);
   void Shutdown();
 
   State state() const { return state_; }
 
   std::string GetAndResetAuthCode();
 
   // Adds or removes observers.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
@@ skipping 51 matching lines @@
   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 OnPrepareContextFailed();
-  void StartAndroidManagementClient();
-  void CheckAndroidManagement();
-  void OnAndroidManagementChecked(
-      policy::AndroidManagementClient::Result result);
-  void StartArcIfSignedIn();
 
   // Unowned pointer. Keeps current profile.
   Profile* profile_ = nullptr;
   // Owned by content::BrowserContent. Used to isolate cookies for auth server
   // communication and shared with Arc OptIn UI platform app.
   content::StoragePartition* storage_partition_ = nullptr;
 
   // Registrar used to monitor ARC enabled state.
   PrefChangeRegistrar pref_change_registrar_;
 
   mojo::Binding<AuthHost> binding_;
   State state_ = State::STOPPED;
   base::ObserverList<Observer> observer_list_;
   std::unique_ptr<GaiaAuthFetcher> merger_fetcher_;
   std::unique_ptr<UbertokenFetcher> ubertoken_fethcher_;
   std::unique_ptr<ArcAppLauncher> playstore_launcher_;
   std::string auth_code_;
   GetAuthCodeCallback auth_callback_;
   bool initial_opt_in_ = false;
   bool context_prepared_ = false;
   UIPage ui_page_ = UIPage::NO_PAGE;
   base::string16 ui_page_status_;
 
-  ProfileOAuth2TokenService* token_service_;
-  std::string account_id_;
-  std::unique_ptr<policy::AndroidManagementClient> android_management_client_;
-
-  base::WeakPtrFactory<ArcAuthService> weak_ptr_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(ArcAuthService);
 };
 
 std::ostream& operator<<(std::ostream& os, const ArcAuthService::State& state);
 
 }  // namespace arc
 
 #endif  // CHROME_BROWSER_CHROMEOS_ARC_ARC_AUTH_SERVICE_H_