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

Unified Diff: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

Issue 856493004: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/login. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
index 275cc8e14dcd28741bf1182361c51dfa020da8f7..3be3904b0f8f0559f48ae0e88e7abb0c3cc98557 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -127,7 +127,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {
return ExistingUserController::current_controller();
}
- virtual void SetUpInProcessBrowserTestFixture() override {
+ void SetUpInProcessBrowserTestFixture() override {
SetUpSessionManager();
DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
@@ -158,7 +158,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {
.Times(1);
}
- virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(switches::kLoginManager);
}
@@ -195,7 +195,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {
.WillRepeatedly(ReturnNull());
}
- virtual void SetUpOnMainThread() override {
+ void SetUpOnMainThread() override {
testing_profile_.reset(new TestingProfile());
SetUpUserManager();
existing_user_controller_.reset(
@@ -209,7 +209,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {
false);
}
- virtual void TearDownOnMainThread() override {
+ void TearDownOnMainThread() override {
// ExistingUserController must be deleted before the thread is cleaned up:
// If there is an outstanding login attempt when ExistingUserController is
// deleted, its LoginPerformer instance will be deleted, which in turn
@@ -380,7 +380,7 @@ class ExistingUserControllerPublicSessionTest
policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION)) {
}
- virtual void SetUpOnMainThread() override {
+ void SetUpOnMainThread() override {
ExistingUserControllerTest::SetUpOnMainThread();
// Wait for the public session user to be created.
@@ -415,7 +415,7 @@ class ExistingUserControllerPublicSessionTest
}
}
- virtual void SetUpSessionManager() override {
+ void SetUpSessionManager() override {
InstallOwnerKey();
// Setup the device policy.
@@ -441,7 +441,7 @@ class ExistingUserControllerPublicSessionTest
device_local_account_policy.GetBlob());
}
- virtual void SetUpLoginDisplay() override {
+ void SetUpLoginDisplay() override {
EXPECT_CALL(*mock_login_display_host_.get(), CreateLoginDisplay(_))
.Times(1)
.WillOnce(Return(mock_login_display_));
@@ -454,8 +454,7 @@ class ExistingUserControllerPublicSessionTest
.Times(AnyNumber());
}
- virtual void SetUpUserManager() override {
- }
+ void SetUpUserManager() override {}
void ExpectSuccessfulLogin(const UserContext& user_context) {
EXPECT_CALL(*mock_login_display_, SetUIEnabled(false))

Powered by Google App Engine
This is Rietveld 408576698