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

chrome/browser/chromeos/login/kiosk_browsertest.cc

 // Copyright (c) 2013 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.
 
 #include <vector>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/shell.h"
 #include "base/bind.h"
@@ skipping 433 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(AppDataLoadWaiter);
 };
 
 }  // namespace
 
 class KioskTest : public OobeBaseTest {
  public:
   KioskTest()
       : settings_helper_(false),
+        use_consumer_kiosk_mode_(true),
         fake_cws_(new FakeCWS) {
     set_exit_when_last_browser_closes(false);
   }
 
   ~KioskTest() override {}
 
  protected:
   void SetUp() override {
     test_app_id_ = kTestKioskApp;
     set_test_app_version("1.0.0");
@@ skipping 232 matching lines @@
         base::Bind(&ConsumerKioskAutoLaunchStatusCheck,
                    &status,
                    runner->QuitClosure()));
     runner->Run();
     CHECK_NE(status,
              static_cast<KioskAppManager::ConsumerKioskAutoLaunchStatus>(-1));
     return status;
   }
 
   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.
     ScopedCanConfigureNetwork can_configure_network(true, true);
 
     // Start app launch and wait for network connectivity timeout.
     StartAppLaunchFromLoginScreen(SimulateNetworkOfflineClosure());
     OobeScreenWaiter splash_waiter(OobeDisplay::SCREEN_APP_LAUNCH_SPLASH);
     splash_waiter.Wait();
     WaitForAppLaunchNetworkTimeout();
@@ skipping 63 matching lines @@
   const std::string& test_crx_file() const { return test_crx_file_; }
   FakeCWS* fake_cws() { return fake_cws_.get(); }
 
   void set_use_consumer_kiosk_mode(bool use) {
     use_consumer_kiosk_mode_ = use;
   }
 
   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_;
   scoped_ptr<FakeCWS> fake_cws_;
   scoped_ptr<MockUserManager> mock_user_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(KioskTest);
 };
 
 IN_PROC_BROWSER_TEST_F(KioskTest, InstallAndLaunchApp) {
@@ skipping 1207 matching lines @@
 }
 
 class KioskEnterpriseTest : public KioskTest {
  protected:
   KioskEnterpriseTest() {
     set_use_consumer_kiosk_mode(false);
   }
 
   void SetUpInProcessBrowserTestFixture() override {
     policy::DevicePolicyCrosTestHelper::MarkAsEnterpriseOwnedBy(
-        test_owner_account_id_.GetUserEmail());
+        kTestOwnerEmail);
     settings_helper_.SetCurrentUserIsOwner(false);
 
     KioskTest::SetUpInProcessBrowserTestFixture();
   }
 
   void SetUpOnMainThread() override {
     KioskTest::SetUpOnMainThread();
 
     // Configure OAuth authentication.
     GaiaUrls* gaia_urls = GaiaUrls::GetInstance();
@@ skipping 190 matching lines @@
 
   bool wallpaper_loaded_;
   scoped_refptr<content::MessageLoopRunner> runner_;
 
   DISALLOW_COPY_AND_ASSIGN(KioskHiddenWebUITest);
 };
 
 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.
   EnableConsumerKioskMode();
   WizardController::SkipPostLoginScreensForTesting();
   WizardController* wizard_controller = WizardController::default_controller();
   CHECK(wizard_controller);
 
   // Start login screen after configuring auto launch app since the warning
   // is triggered when switching to login screen.
   wizard_controller->AdvanceToScreen(WizardController::kNetworkScreenName);
   ReloadAutolaunchKioskApps();
   wizard_controller->SkipToLoginForTesting(LoginScreenContext());
 
   EXPECT_FALSE(KioskAppManager::Get()->GetAutoLaunchApp().empty());
   EXPECT_FALSE(KioskAppManager::Get()->IsAutoLaunchEnabled());
 
   // Wait for the auto launch warning come up.
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
       content::NotificationService::AllSources()).Wait();
 
   // Wait for the wallpaper to load.
   WaitForWallpaper();
   EXPECT_TRUE(wallpaper_loaded());
 }
 
 }  // namespace chromeos