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

chrome/browser/chromeos/status/data_promo_notification_unittest.cc

 // Copyright (c) 2015 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 "chrome/browser/chromeos/status/data_promo_notification.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
@@ skipping 68 matching lines @@
     user_manager_enabler_.reset();
     data_promo_notification_.reset();
     NetworkHandler::Shutdown();
     DBusThreadManager::Shutdown();
     testing::Test::TearDown();
   }
 
  protected:
   void SetupUser() {
     scoped_ptr<FakeChromeUserManager> user_manager(new FakeChromeUserManager());
-    const AccountId test_account_id(AccountId::FromUserEmail(kTestUserName));
-    user_manager->AddUser(test_account_id);
-    user_manager->LoginUser(test_account_id);
+    user_manager->AddUser(kTestUserName);
+    user_manager->LoginUser(kTestUserName);
     user_manager_enabler_.reset(
         new ScopedUserManagerEnabler(user_manager.release()));
 
     profile_manager_.reset(
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
     ASSERT_TRUE(profile_manager_->SetUp());
     profile_manager_->SetLoggedIn(true);
     ASSERT_TRUE(user_manager::UserManager::Get()->GetPrimaryUser());
 
     LoginState::Initialize();
@@ skipping 50 matching lines @@
 
   ui::NetworkConnect::Get()->ConnectToNetwork(kCellularServicePath);
   base::RunLoop().RunUntilIdle();
   // Connecting to cellular network (which here makes it the default network)
   // should trigger the Data Saver notification.
   EXPECT_TRUE(message_center->FindVisibleNotificationById(kNotificationId));
 }
 
 }  // namespace test
 }  // namespace chromeos