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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm
diff --git a/chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm b/chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm
index aab68ea55ceea6089350425a7a48ab959d9fe012..9413087ae0d6ed793244ad5e6f556128719850a5 100644
--- a/chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/cocoa/profiles/user_manager_mac.h"
#include "base/run_loop.h"
+#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/profiles/profile_window.h"
#include "chrome/test/base/browser_with_test_window_test.h"
#include "chrome/test/base/testing_browser_process.h"
@@ -19,13 +20,14 @@ class UserManagerMacTest : public BrowserWithTestWindowTest {
virtual void SetUp() OVERRIDE {
BrowserWithTestWindowTest::SetUp();
ASSERT_TRUE(testing_profile_manager_.SetUp());
- // Pre-load the guest profile so we don't have to wait for the User Manager
- // to asynchronously create it.
- testing_profile_manager_.CreateGuestProfile();
+ // Pre-load the special profile so we don't have to wait for the
+ // User Manager to asynchronously create it.
+ testing_profile_manager_.CreateUserManagerProfile();
}
virtual void TearDown() OVERRIDE {
- testing_profile_manager_.DeleteGuestProfile();
+ testing_profile_manager_.DeleteProfileWithPath(
+ ProfileManager::GetUserManagerProfilePath());
TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL);
base::RunLoop().RunUntilIdle();
BrowserWithTestWindowTest::TearDown();
« 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