UserManager stack refactoring.

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/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/notifications/message_center_settings_controller.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/message_center/notifier_settings.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/system/system_notifier.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #endif
 
 class MessageCenterSettingsControllerBaseTest : public testing::Test {
  protected:
   MessageCenterSettingsControllerBaseTest()
       : testing_profile_manager_(TestingBrowserProcess::GetGlobal()){};
 
   ~MessageCenterSettingsControllerBaseTest() override{};
 
@@ skipping 32 matching lines @@
 class MessageCenterSettingsControllerChromeOSTest
     : public MessageCenterSettingsControllerBaseTest {
  protected:
   MessageCenterSettingsControllerChromeOSTest() {}
   ~MessageCenterSettingsControllerChromeOSTest() override {}
 
   void SetUp() override {
     MessageCenterSettingsControllerBaseTest::SetUp();
 
     // Initialize the UserManager singleton to a fresh FakeUserManager instance.
-    user_manager_enabler_.reset(
-        new chromeos::ScopedUserManagerEnabler(new chromeos::FakeUserManager));
+    user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
+        new chromeos::FakeChromeUserManager));
   }
 
   void TearDown() override {
     ResetController();
     MessageCenterSettingsControllerBaseTest::TearDown();
   }
 
   TestingProfile* CreateProfile(const std::string& name) override {
     TestingProfile* profile =
         MessageCenterSettingsControllerBaseTest::CreateProfile(name);
 
     GetFakeUserManager()->AddUser(name);
     GetFakeUserManager()->LoginUser(name);
     return profile;
   }
 
   void SwitchActiveUser(const std::string& name) {
     GetFakeUserManager()->SwitchActiveUser(name);
     controller()->ActiveUserChanged(GetFakeUserManager()->GetActiveUser());
   }
 
  private:
-  chromeos::FakeUserManager* GetFakeUserManager() {
-    return static_cast<chromeos::FakeUserManager*>(
+  chromeos::FakeChromeUserManager* GetFakeUserManager() {
+    return static_cast<chromeos::FakeChromeUserManager*>(
         user_manager::UserManager::Get());
   }
 
   scoped_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageCenterSettingsControllerChromeOSTest);
 };
 
 typedef MessageCenterSettingsControllerChromeOSTest
     MessageCenterSettingsControllerTest;
@@ skipping 137 matching lines @@
   EXPECT_EQ(3u, notifiers.size());
   EXPECT_EQ(ash::system_notifier::kNotifierScreenshot,
             notifiers[2]->notifier_id.id);
 #endif
 
   EXPECT_EQ(kBarId, notifiers[0]->notifier_id.id);
   EXPECT_EQ(kFooId, notifiers[1]->notifier_id.id);
 
   STLDeleteElements(&notifiers);
 }