Made a ScopedMockUserManagerEnabler to simplify UserManager mocking life-cycle.

chrome/browser/chromeos/cros_settings_unittest.cc

 // Copyright (c) 2012 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/login/signed_settings.h"
 
 #include <map>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 26 matching lines @@
         ui_thread_(content::BrowserThread::UI, &message_loop_),
         file_thread_(content::BrowserThread::FILE, &message_loop_),
         pointer_factory_(this),
         local_state_(static_cast<TestingBrowserProcess*>(g_browser_process)) {
   }
 
   virtual ~CrosSettingsTest() {
   }
 
   virtual void SetUp() {
-    mock_user_manager_.reset(new MockUserManager());
-    old_user_manager_ = UserManager::Set(mock_user_manager_.get());
-    EXPECT_CALL(*mock_user_manager_, IsCurrentUserOwner())
+    EXPECT_CALL(*mock_user_manager_.user_manager(), IsCurrentUserOwner())
         .Times(AnyNumber())
         .WillRepeatedly(Return(true));
     // Reset the cache between tests.
     ApplyEmptyPolicy();
   }
 
   virtual void TearDown() {
     message_loop_.RunAllPending();
     ASSERT_TRUE(expected_props_.empty());
     // Reset the cache between tests.
     ApplyEmptyPolicy();
     STLDeleteValues(&expected_props_);
-    UserManager::Set(old_user_manager_);
   }
 
   void FetchPref(const std::string& pref) {
     DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
     if (expected_props_.find(pref) == expected_props_.end())
       return;
 
     if (CrosSettings::Get()->PrepareTrustedValues(
             base::Bind(&CrosSettingsTest::FetchPref,
                        pointer_factory_.GetWeakPtr(), pref))) {
@@ skipping 43 matching lines @@
   std::map<std::string, base::Value*> expected_props_;
 
   MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
   base::WeakPtrFactory<CrosSettingsTest> pointer_factory_;
 
   ScopedTestingLocalState local_state_;
 
-  scoped_ptr<MockUserManager> mock_user_manager_;
-  UserManager* old_user_manager_;
+  ScopedMockUserManagerEnabler mock_user_manager_;
   ScopedStubCrosEnabler stub_cros_enabler_;
 };
 
 TEST_F(CrosSettingsTest, SetPref) {
   // Change to something that is not the default.
   AddExpectation(kAccountsPrefAllowGuest,
                  base::Value::CreateBooleanValue(false));
   SetPref(kAccountsPrefAllowGuest, expected_props_[kAccountsPrefAllowGuest]);
   FetchPref(kAccountsPrefAllowGuest);
   message_loop_.RunAllPending();
@@ skipping 101 matching lines @@
 
 TEST_F(CrosSettingsTest, SetEphemeralUsersEnabled) {
   base::FundamentalValue ephemeral_users_enabled(true);
   AddExpectation(kAccountsPrefEphemeralUsersEnabled,
                  base::Value::CreateBooleanValue(true));
   SetPref(kAccountsPrefEphemeralUsersEnabled, &ephemeral_users_enabled);
   FetchPref(kAccountsPrefEphemeralUsersEnabled);
 }
 
 }  // namespace chromeos