This CL replaces user_manager::UserID with AccountId.

chrome/browser/notifications/message_center_settings_controller_unittest.cc

 // Copyright 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 <string>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 72 matching lines @@
 
   void TearDown() override {
     ResetController();
     MessageCenterSettingsControllerBaseTest::TearDown();
   }
 
   TestingProfile* CreateProfile(const std::string& name) override {
     TestingProfile* profile =
         MessageCenterSettingsControllerBaseTest::CreateProfile(name);
 
-    GetFakeUserManager()->AddUser(name);
-    GetFakeUserManager()->LoginUser(name);
+    GetFakeUserManager()->AddUser(AccountId::FromUserEmail(name));
+    GetFakeUserManager()->LoginUser(AccountId::FromUserEmail(name));
     return profile;
   }
 
   void SwitchActiveUser(const std::string& name) {
-    GetFakeUserManager()->SwitchActiveUser(name);
+    GetFakeUserManager()->SwitchActiveUser(AccountId::FromUserEmail(name));
     controller()->ActiveUserChanged(GetFakeUserManager()->GetActiveUser());
   }
 
  private:
   chromeos::FakeChromeUserManager* GetFakeUserManager() {
     return static_cast<chromeos::FakeChromeUserManager*>(
         user_manager::UserManager::Get());
   }
 
   scoped_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
@@ skipping 224 matching lines @@
   // (5) Enable the permission when the default is blocked (expected to set).
   controller()->SetNotifierEnabled(disabled_notifier, true);
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             DesktopNotificationProfileUtil::GetContentSetting(profile, origin));
 
   // (6) Disable the permission when the default is blocked (expected to clear).
   controller()->SetNotifierEnabled(enabled_notifier, false);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             DesktopNotificationProfileUtil::GetContentSetting(profile, origin));
 }