diff options
| author | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 07:49:36 +0000 |
|---|---|---|
| committer | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 07:49:36 +0000 |
| commit | c5b03f3c98aa1b39c5f008cadb21b8b4d20612bd (patch) | |
| tree | 7991565a9596c6547d714e284075c57f0c122be7 /chrome/browser/browser_commands_unittest.cc | |
| parent | 57a16e6bf5ca7fefb9fc83f0bdbec35113240c9e (diff) | |
| download | chromium_src-c5b03f3c98aa1b39c5f008cadb21b8b4d20612bd.zip chromium_src-c5b03f3c98aa1b39c5f008cadb21b8b4d20612bd.tar.gz chromium_src-c5b03f3c98aa1b39c5f008cadb21b8b4d20612bd.tar.bz2 | |
Made a ScopedMockUserManagerEnabler to simplify UserManager mocking life-cycle.
BUG=none
TEST=unit_tests,browser_tests
Review URL: https://chromiumcodereview.appspot.com/9826010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128870 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_commands_unittest.cc')
| -rw-r--r-- | chrome/browser/browser_commands_unittest.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc index d783af8..ea4d148 100644 --- a/chrome/browser/browser_commands_unittest.cc +++ b/chrome/browser/browser_commands_unittest.cc @@ -182,9 +182,8 @@ TEST_F(BrowserCommandsTest, BackForwardInNewTab) { namespace chromeos { TEST_F(BrowserCommandsTest, Search) { - scoped_ptr<MockUserManager> mock_user_manager(new MockUserManager()); - UserManager* old_user_manager = UserManager::Set(mock_user_manager.get()); - EXPECT_CALL(*mock_user_manager, IsLoggedInAsGuest()) + ScopedMockUserManagerEnabler mock_user_manager; + EXPECT_CALL(*mock_user_manager.user_manager(), IsLoggedInAsGuest()) .Times(1).WillRepeatedly(::testing::Return(false)); // Load a non-NTP URL. @@ -208,8 +207,6 @@ TEST_F(BrowserCommandsTest, Search) { current_url = browser()->GetSelectedWebContents()->GetURL(); EXPECT_TRUE(current_url.SchemeIs(chrome::kChromeUIScheme)); EXPECT_EQ(chrome::kChromeUINewTabHost, current_url.host()); - - UserManager::Set(old_user_manager); } } // namespace chromeos |