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

Side by Side Diff: chrome/browser/app_controller_mac_unittest.mm

Issue 14923004: [Mac] AppController needs to update its "last profile" pointer when the active profile is deleted (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: derp. no test on CrOS either. Created 7 years, 5 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
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/profiles/profile_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/files/file_path.h"
7 #include "base/mac/scoped_nsobject.h" 8 #include "base/mac/scoped_nsobject.h"
8 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
9 #import "chrome/browser/app_controller_mac.h" 10 #import "chrome/browser/app_controller_mac.h"
11 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
12 #include "chrome/browser/profiles/profile_manager.h"
13 #include "chrome/common/chrome_constants.h"
14 #include "chrome/common/pref_names.h"
15 #include "chrome/test/base/testing_profile_manager.h"
16 #include "chrome/test/base/ui_test_utils.h"
10 #include "testing/platform_test.h" 17 #include "testing/platform_test.h"
11 18
12 class AppControllerTest : public PlatformTest { 19 class AppControllerTest : public PlatformTest {
20 protected:
21 AppControllerTest()
22 : ui_thread_(content::BrowserThread::UI, &message_loop_),
23 db_thread_(content::BrowserThread::DB, &message_loop_),
24 file_thread_(content::BrowserThread::FILE, &message_loop_) {
25 }
26
27 virtual void TearDown() {
28 TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL);
29 message_loop_.RunUntilIdle();
30 }
31
32 base::MessageLoopForUI message_loop_;
33 content::TestBrowserThread ui_thread_;
34 content::TestBrowserThread db_thread_;
35 content::TestBrowserThread file_thread_;
13 }; 36 };
14 37
15 TEST_F(AppControllerTest, DockMenu) { 38 TEST_F(AppControllerTest, DockMenu) {
16 base::scoped_nsobject<AppController> ac([[AppController alloc] init]); 39 base::scoped_nsobject<AppController> ac([[AppController alloc] init]);
17 NSMenu* menu = [ac applicationDockMenu:NSApp]; 40 NSMenu* menu = [ac applicationDockMenu:NSApp];
18 NSMenuItem* item; 41 NSMenuItem* item;
19 42
20 EXPECT_TRUE(menu); 43 EXPECT_TRUE(menu);
21 EXPECT_NE(-1, [menu indexOfItemWithTag:IDC_NEW_WINDOW]); 44 EXPECT_NE(-1, [menu indexOfItemWithTag:IDC_NEW_WINDOW]);
22 EXPECT_NE(-1, [menu indexOfItemWithTag:IDC_NEW_INCOGNITO_WINDOW]); 45 EXPECT_NE(-1, [menu indexOfItemWithTag:IDC_NEW_INCOGNITO_WINDOW]);
23 for (item in [menu itemArray]) { 46 for (item in [menu itemArray]) {
24 EXPECT_EQ(ac.get(), [item target]); 47 EXPECT_EQ(ac.get(), [item target]);
25 EXPECT_EQ(@selector(commandFromDock:), [item action]); 48 EXPECT_EQ(@selector(commandFromDock:), [item action]);
26 } 49 }
27 } 50 }
51
52 TEST_F(AppControllerTest, LastProfile) {
53 TestingProfileManager manager(TestingBrowserProcess::GetGlobal());
54 ASSERT_TRUE(manager.SetUp());
55
56 // Create two profiles.
57 base::FilePath dest_path1 =
58 manager.CreateTestingProfile("New Profile 1")->GetPath();
59 base::FilePath dest_path2 =
60 manager.CreateTestingProfile("New Profile 2")->GetPath();
61 ASSERT_EQ(2U, manager.profile_manager()->GetNumberOfProfiles());
62 ASSERT_EQ(2U, manager.profile_manager()->GetLoadedProfiles().size());
63
64 PrefService* local_state = g_browser_process->local_state();
65 local_state->SetString(prefs::kProfileLastUsed,
66 dest_path1.BaseName().MaybeAsASCII());
67
68 base::scoped_nsobject<AppController> ac([[AppController alloc] init]);
69
70 // Delete the active profile.
71 manager.profile_manager()->ScheduleProfileForDeletion(
72 dest_path1, ProfileManager::CreateCallback());
73
74 message_loop_.RunUntilIdle();
75
76 EXPECT_EQ(dest_path2, [ac lastProfile]->GetPath());
77 }
OLDNEW
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/profiles/profile_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698