Revert of This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/kiosk_browsertest.cc

Index: chrome/browser/chromeos/login/kiosk_browsertest.cc
diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc
index f045f45b7bfdd7f89bce4e0d87633dba3c011e1c..7b80284b2d6b88235373cf8a905ab1877845fecf 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -451,6 +451,7 @@
  public:
   KioskTest()
       : settings_helper_(false),
+        use_consumer_kiosk_mode_(true),
         fake_cws_(new FakeCWS) {
     set_exit_when_last_browser_closes(false);
   }
@@ -703,7 +704,7 @@
   }
 
   void RunAppLaunchNetworkDownTest() {
-    mock_user_manager()->SetActiveUser(test_owner_account_id_);
+    mock_user_manager()->SetActiveUser(kTestOwnerEmail);
     AppLaunchSigninScreen::SetUserManagerForTesting(mock_user_manager());
 
     // Mock network could be configured with owner's password.
@@ -787,11 +788,8 @@
   ScopedCrosSettingsTestHelper settings_helper_;
   scoped_ptr<FakeOwnerSettingsService> owner_settings_service_;
 
-  const AccountId test_owner_account_id_ =
-      AccountId::FromUserEmail(kTestOwnerEmail);
-
  private:
-  bool use_consumer_kiosk_mode_ = true;
+  bool use_consumer_kiosk_mode_;
   std::string test_app_id_;
   std::string test_app_version_;
   std::string test_crx_file_;
@@ -2019,7 +2017,7 @@
 
   void SetUpInProcessBrowserTestFixture() override {
     policy::DevicePolicyCrosTestHelper::MarkAsEnterpriseOwnedBy(
-        test_owner_account_id_.GetUserEmail());
+        kTestOwnerEmail);
     settings_helper_.SetCurrentUserIsOwner(false);
 
     KioskTest::SetUpInProcessBrowserTestFixture();
@@ -2230,7 +2228,7 @@
 IN_PROC_BROWSER_TEST_F(KioskHiddenWebUITest, AutolaunchWarning) {
   // Add a device owner.
   FakeChromeUserManager* user_manager = new FakeChromeUserManager();
-  user_manager->AddUser(test_owner_account_id_);
+  user_manager->AddUser(kTestOwnerEmail);
   ScopedUserManagerEnabler enabler(user_manager);
 
   // Set kiosk app to autolaunch.