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

Side by Side Diff: chrome/browser/notifications/message_center_settings_controller_unittest.cc

Issue 869753002: Update {virtual,override,final} to follow C++11 style in chrome, round 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix format 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/extensions/test_extension_system.h" 10 #include "chrome/browser/extensions/test_extension_system.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 // Initialize the UserManager singleton to a fresh FakeUserManager instance. 76 // Initialize the UserManager singleton to a fresh FakeUserManager instance.
77 user_manager_enabler_.reset( 77 user_manager_enabler_.reset(
78 new chromeos::ScopedUserManagerEnabler(new chromeos::FakeUserManager)); 78 new chromeos::ScopedUserManagerEnabler(new chromeos::FakeUserManager));
79 } 79 }
80 80
81 void TearDown() override { 81 void TearDown() override {
82 ResetController(); 82 ResetController();
83 MessageCenterSettingsControllerBaseTest::TearDown(); 83 MessageCenterSettingsControllerBaseTest::TearDown();
84 } 84 }
85 85
86 virtual TestingProfile* CreateProfile(const std::string& name) override { 86 TestingProfile* CreateProfile(const std::string& name) override {
87 TestingProfile* profile = 87 TestingProfile* profile =
88 MessageCenterSettingsControllerBaseTest::CreateProfile(name); 88 MessageCenterSettingsControllerBaseTest::CreateProfile(name);
89 89
90 GetFakeUserManager()->AddUser(name); 90 GetFakeUserManager()->AddUser(name);
91 GetFakeUserManager()->LoginUser(name); 91 GetFakeUserManager()->LoginUser(name);
92 return profile; 92 return profile;
93 } 93 }
94 94
95 void SwitchActiveUser(const std::string& name) { 95 void SwitchActiveUser(const std::string& name) {
96 GetFakeUserManager()->SwitchActiveUser(name); 96 GetFakeUserManager()->SwitchActiveUser(name);
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 EXPECT_EQ(3u, notifiers.size()); 250 EXPECT_EQ(3u, notifiers.size());
251 EXPECT_EQ(ash::system_notifier::kNotifierScreenshot, 251 EXPECT_EQ(ash::system_notifier::kNotifierScreenshot,
252 notifiers[2]->notifier_id.id); 252 notifiers[2]->notifier_id.id);
253 #endif 253 #endif
254 254
255 EXPECT_EQ(kBarId, notifiers[0]->notifier_id.id); 255 EXPECT_EQ(kBarId, notifiers[0]->notifier_id.id);
256 EXPECT_EQ(kFooId, notifiers[1]->notifier_id.id); 256 EXPECT_EQ(kFooId, notifiers[1]->notifier_id.id);
257 257
258 STLDeleteElements(&notifiers); 258 STLDeleteElements(&notifiers);
259 } 259 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698