Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Side by Side Diff: chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm

Issue 239543012: The User Manager should be backed by a special profile, not the guest one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nico's comment + fix tests Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/cocoa/profiles/user_manager_mac.h" 5 #include "chrome/browser/ui/cocoa/profiles/user_manager_mac.h"
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "chrome/browser/profiles/profile_manager.h"
8 #include "chrome/browser/profiles/profile_window.h" 9 #include "chrome/browser/profiles/profile_window.h"
9 #include "chrome/test/base/browser_with_test_window_test.h" 10 #include "chrome/test/base/browser_with_test_window_test.h"
10 #include "chrome/test/base/testing_browser_process.h" 11 #include "chrome/test/base/testing_browser_process.h"
11 #include "chrome/test/base/testing_profile_manager.h" 12 #include "chrome/test/base/testing_profile_manager.h"
12 13
13 class UserManagerMacTest : public BrowserWithTestWindowTest { 14 class UserManagerMacTest : public BrowserWithTestWindowTest {
14 public: 15 public:
15 UserManagerMacTest() 16 UserManagerMacTest()
16 : testing_profile_manager_(TestingBrowserProcess::GetGlobal()) { 17 : testing_profile_manager_(TestingBrowserProcess::GetGlobal()) {
17 } 18 }
18 19
19 virtual void SetUp() OVERRIDE { 20 virtual void SetUp() OVERRIDE {
20 BrowserWithTestWindowTest::SetUp(); 21 BrowserWithTestWindowTest::SetUp();
21 ASSERT_TRUE(testing_profile_manager_.SetUp()); 22 ASSERT_TRUE(testing_profile_manager_.SetUp());
22 // Pre-load the guest profile so we don't have to wait for the User Manager 23 // Pre-load the special profile so we don't have to wait for the
23 // to asynchronously create it. 24 // User Manager to asynchronously create it.
24 testing_profile_manager_.CreateGuestProfile(); 25 testing_profile_manager_.CreateUserManagerProfile();
25 } 26 }
26 27
27 virtual void TearDown() OVERRIDE { 28 virtual void TearDown() OVERRIDE {
28 testing_profile_manager_.DeleteGuestProfile(); 29 testing_profile_manager_.DeleteProfileWithPath(
30 ProfileManager::GetUserManagerProfilePath());
29 TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL); 31 TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL);
30 base::RunLoop().RunUntilIdle(); 32 base::RunLoop().RunUntilIdle();
31 BrowserWithTestWindowTest::TearDown(); 33 BrowserWithTestWindowTest::TearDown();
32 } 34 }
33 35
34 private: 36 private:
35 TestingProfileManager testing_profile_manager_; 37 TestingProfileManager testing_profile_manager_;
36 38
37 DISALLOW_COPY_AND_ASSIGN(UserManagerMacTest); 39 DISALLOW_COPY_AND_ASSIGN(UserManagerMacTest);
38 }; 40 };
39 41
40 TEST_F(UserManagerMacTest, ShowUserManager) { 42 TEST_F(UserManagerMacTest, ShowUserManager) {
41 EXPECT_FALSE(UserManagerMac::IsShowing()); 43 EXPECT_FALSE(UserManagerMac::IsShowing());
42 UserManagerMac::Show(base::FilePath(), profiles::USER_MANAGER_NO_TUTORIAL); 44 UserManagerMac::Show(base::FilePath(), profiles::USER_MANAGER_NO_TUTORIAL);
43 EXPECT_TRUE(UserManagerMac::IsShowing()); 45 EXPECT_TRUE(UserManagerMac::IsShowing());
44 46
45 UserManagerMac::Hide(); 47 UserManagerMac::Hide();
46 EXPECT_FALSE(UserManagerMac::IsShowing()); 48 EXPECT_FALSE(UserManagerMac::IsShowing());
47 } 49 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/profiles/user_manager_mac.mm ('k') | chrome/browser/ui/views/profiles/user_manager_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698