Index: chrome/browser/app_controller_mac_unittest.mm |
diff --git a/chrome/browser/app_controller_mac_unittest.mm b/chrome/browser/app_controller_mac_unittest.mm |
index a17c76d94c799e7be09fd3141a4fc3746fd80b61..ed9c813deaed1d19c0dedaafa94b426c331eb560 100644 |
--- a/chrome/browser/app_controller_mac_unittest.mm |
+++ b/chrome/browser/app_controller_mac_unittest.mm |
@@ -4,12 +4,35 @@ |
#import <Cocoa/Cocoa.h> |
+#include "base/files/file_path.h" |
#include "base/mac/scoped_nsobject.h" |
#include "chrome/app/chrome_command_ids.h" |
#import "chrome/browser/app_controller_mac.h" |
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h" |
+#include "chrome/browser/profiles/profile_manager.h" |
+#include "chrome/common/chrome_constants.h" |
+#include "chrome/common/pref_names.h" |
+#include "chrome/test/base/testing_profile_manager.h" |
+#include "chrome/test/base/ui_test_utils.h" |
#include "testing/platform_test.h" |
class AppControllerTest : public PlatformTest { |
+ protected: |
+ AppControllerTest() |
+ : ui_thread_(content::BrowserThread::UI, &message_loop_), |
+ db_thread_(content::BrowserThread::DB, &message_loop_), |
+ file_thread_(content::BrowserThread::FILE, &message_loop_) { |
+ } |
+ |
+ virtual void TearDown() { |
+ TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL); |
+ message_loop_.RunUntilIdle(); |
+ } |
+ |
+ base::MessageLoopForUI message_loop_; |
+ content::TestBrowserThread ui_thread_; |
+ content::TestBrowserThread db_thread_; |
+ content::TestBrowserThread file_thread_; |
}; |
TEST_F(AppControllerTest, DockMenu) { |
@@ -25,3 +48,30 @@ TEST_F(AppControllerTest, DockMenu) { |
EXPECT_EQ(@selector(commandFromDock:), [item action]); |
} |
} |
+ |
+TEST_F(AppControllerTest, LastProfile) { |
+ TestingProfileManager manager(TestingBrowserProcess::GetGlobal()); |
+ ASSERT_TRUE(manager.SetUp()); |
+ |
+ // Create two profiles. |
+ base::FilePath dest_path1 = |
+ manager.CreateTestingProfile("New Profile 1")->GetPath(); |
+ base::FilePath dest_path2 = |
+ manager.CreateTestingProfile("New Profile 2")->GetPath(); |
+ ASSERT_EQ(2U, manager.profile_manager()->GetNumberOfProfiles()); |
+ ASSERT_EQ(2U, manager.profile_manager()->GetLoadedProfiles().size()); |
+ |
+ PrefService* local_state = g_browser_process->local_state(); |
+ local_state->SetString(prefs::kProfileLastUsed, |
+ dest_path1.BaseName().MaybeAsASCII()); |
+ |
+ base::scoped_nsobject<AppController> ac([[AppController alloc] init]); |
+ |
+ // Delete the active profile. |
+ manager.profile_manager()->ScheduleProfileForDeletion( |
+ dest_path1, ProfileManager::CreateCallback()); |
+ |
+ message_loop_.RunUntilIdle(); |
+ |
+ EXPECT_EQ(dest_path2, [ac lastProfile]->GetPath()); |
+} |