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

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

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 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 2758b95dc2fddb045a61ed1a6b0a74eae2d57abc..c1341417a66f445445c67f3d64aea91252be78f7 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -94,7 +94,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {
return ExistingUserController::current_controller();
}
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+ virtual void SetUpInProcessBrowserTestFixture() override {
SetUpSessionManager();
DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
@@ -125,7 +125,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {
.Times(1);
}
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) override {
command_line->AppendSwitch(switches::kLoginManager);
}
@@ -162,7 +162,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {
.Times(1);
}
- virtual void SetUpOnMainThread() OVERRIDE {
+ virtual void SetUpOnMainThread() override {
testing_profile_.reset(new TestingProfile());
SetUpUserManager();
existing_user_controller_.reset(
@@ -175,7 +175,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {
testing_profile_.get());
}
- virtual void TearDownOnMainThread() OVERRIDE {
+ virtual 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
@@ -347,7 +347,7 @@ class ExistingUserControllerPublicSessionTest
policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION)) {
}
- virtual void SetUpOnMainThread() OVERRIDE {
+ virtual void SetUpOnMainThread() override {
ExistingUserControllerTest::SetUpOnMainThread();
// Wait for the public session user to be created.
@@ -382,7 +382,7 @@ class ExistingUserControllerPublicSessionTest
}
}
- virtual void SetUpSessionManager() OVERRIDE {
+ virtual void SetUpSessionManager() override {
InstallOwnerKey();
// Setup the device policy.
@@ -408,7 +408,7 @@ class ExistingUserControllerPublicSessionTest
device_local_account_policy.GetBlob());
}
- virtual void SetUpLoginDisplay() OVERRIDE {
+ virtual void SetUpLoginDisplay() override {
EXPECT_CALL(*mock_login_display_host_.get(), CreateLoginDisplay(_))
.Times(1)
.WillOnce(Return(mock_login_display_));
@@ -421,7 +421,7 @@ class ExistingUserControllerPublicSessionTest
.Times(AnyNumber());
}
- virtual void SetUpUserManager() OVERRIDE {
+ virtual void SetUpUserManager() override {
}
void ExpectSuccessfulLogin(const UserContext& user_context) {
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.h ('k') | chrome/browser/chromeos/login/fake_login_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698