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

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

Issue 836393007: Update {virtual,override,final} for chrome/ to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanups Created 5 years, 11 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 | « no previous file | chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc » ('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/files/file_path.h"
8 #include "base/mac/scoped_nsobject.h" 8 #include "base/mac/scoped_nsobject.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
11 #import "chrome/browser/app_controller_mac.h" 11 #import "chrome/browser/app_controller_mac.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/profiles/profile_manager.h" 13 #include "chrome/browser/profiles/profile_manager.h"
14 #include "chrome/common/chrome_constants.h" 14 #include "chrome/common/chrome_constants.h"
15 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
16 #include "chrome/test/base/testing_browser_process.h" 16 #include "chrome/test/base/testing_browser_process.h"
17 #include "chrome/test/base/testing_profile.h" 17 #include "chrome/test/base/testing_profile.h"
18 #include "chrome/test/base/testing_profile_manager.h" 18 #include "chrome/test/base/testing_profile_manager.h"
19 #include "content/public/test/test_browser_thread_bundle.h" 19 #include "content/public/test/test_browser_thread_bundle.h"
20 #include "testing/platform_test.h" 20 #include "testing/platform_test.h"
21 21
22 class AppControllerTest : public PlatformTest { 22 class AppControllerTest : public PlatformTest {
23 protected: 23 protected:
24 AppControllerTest() {} 24 AppControllerTest() {}
25 25
26 virtual void TearDown() { 26 void TearDown() override {
27 TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL); 27 TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL);
28 base::RunLoop().RunUntilIdle(); 28 base::RunLoop().RunUntilIdle();
29 } 29 }
30 30
31 content::TestBrowserThreadBundle thread_bundle_; 31 content::TestBrowserThreadBundle thread_bundle_;
32 }; 32 };
33 33
34 TEST_F(AppControllerTest, DockMenu) { 34 TEST_F(AppControllerTest, DockMenu) {
35 base::scoped_nsobject<AppController> ac([[AppController alloc] init]); 35 base::scoped_nsobject<AppController> ac([[AppController alloc] init]);
36 NSMenu* menu = [ac applicationDockMenu:NSApp]; 36 NSMenu* menu = [ac applicationDockMenu:NSApp];
(...skipping 27 matching lines...) Expand all
64 base::scoped_nsobject<AppController> ac([[AppController alloc] init]); 64 base::scoped_nsobject<AppController> ac([[AppController alloc] init]);
65 65
66 // Delete the active profile. 66 // Delete the active profile.
67 manager.profile_manager()->ScheduleProfileForDeletion( 67 manager.profile_manager()->ScheduleProfileForDeletion(
68 dest_path1, ProfileManager::CreateCallback()); 68 dest_path1, ProfileManager::CreateCallback());
69 69
70 base::RunLoop().RunUntilIdle(); 70 base::RunLoop().RunUntilIdle();
71 71
72 EXPECT_EQ(dest_path2, [ac lastProfile]->GetPath()); 72 EXPECT_EQ(dest_path2, [ac lastProfile]->GetPath());
73 } 73 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698