Made a ScopedMockUserManagerEnabler to simplify UserManager mocking life-cycle.

chrome/browser/chromeos/cros/onc_network_parser_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/cros/onc_network_parser.h"
 
 #include <cert.h>
 #include <keyhi.h>
 #include <pk11pub.h>
 
@@ skipping 867 matching lines @@
             net::ProxyServer(net::ProxyServer::SCHEME_SOCKS5,
                              net::HostPortPair(socks_host, kSocksPort)));
   // Verify bypass rules.
   net::ProxyBypassRules expected_bypass_rules;
   expected_bypass_rules.AddRuleFromString("google.com");
   expected_bypass_rules.AddRuleToBypassLocal();
   EXPECT_TRUE(expected_bypass_rules.Equals(rules.bypass_rules));
 }
 
 TEST(OncNetworkParserUserExpansionTest, GetUserExpandedValue) {
-  scoped_ptr<MockUserManager> mock_user_manager(new MockUserManager());
-  UserManager* old_user_manager = UserManager::Set(mock_user_manager.get());
-  mock_user_manager->SetLoggedInUser("onc@example.com", false);
+  ScopedMockUserManagerEnabler mock_user_manager;
+  mock_user_manager.user_manager()->SetLoggedInUser("onc@example.com", false);
 
-  EXPECT_CALL(*mock_user_manager, IsUserLoggedIn())
+  EXPECT_CALL(*mock_user_manager.user_manager(), IsUserLoggedIn())
       .Times(2)
       .WillRepeatedly(Return(false));
 
   NetworkUIData::ONCSource source = NetworkUIData::ONC_SOURCE_USER_IMPORT;
 
   // Setup environment needed by UserManager.
   MessageLoop loop;
   content::TestBrowserThread ui_thread(content::BrowserThread::UI, &loop);
   base::ShadowingAtExitManager at_exit_manager;
   ScopedTestingLocalState local_state(
       static_cast<TestingBrowserProcess*>(g_browser_process));
 
   base::StringValue login_id_pattern("a ${LOGIN_ID} b");
   base::StringValue login_email_pattern("a ${LOGIN_EMAIL} b");
 
   // No expansion if there is no user logged in.
   EXPECT_EQ("a ${LOGIN_ID} b",
             chromeos::OncNetworkParser::GetUserExpandedValue(
                 login_id_pattern, source));
   EXPECT_EQ("a ${LOGIN_EMAIL} b",
             chromeos::OncNetworkParser::GetUserExpandedValue(
                 login_email_pattern, source));
 
   // Log in a user and check that the expansions work as expected.
-  EXPECT_CALL(*mock_user_manager, IsUserLoggedIn())
+  EXPECT_CALL(*mock_user_manager.user_manager(), IsUserLoggedIn())
       .Times(2)
       .WillRepeatedly(Return(true));
 
   EXPECT_EQ("a onc b",
             chromeos::OncNetworkParser::GetUserExpandedValue(
                 login_id_pattern, source));
   EXPECT_EQ("a onc@example.com b",
             chromeos::OncNetworkParser::GetUserExpandedValue(
                 login_email_pattern, source));
-
-  UserManager::Set(old_user_manager);
 }
 
 }  // namespace chromeos