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

Unified Diff: chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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
« no previous file with comments | « chrome/browser/signin/easy_unlock_service.cc ('k') | chrome/browser/signin/easy_unlock_service_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc
diff --git a/chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc b/chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc
index 8da28d33e3ccbf4f1a16d5449b26f324677549a2..18385103e577929e8a1044393fa3229535169503 100644
--- a/chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc
+++ b/chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc
@@ -98,7 +98,7 @@ class EasyUnlockServiceTest : public InProcessBrowserTest {
#endif
// InProcessBrowserTest:
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+ virtual void SetUpInProcessBrowserTestFixture() override {
EXPECT_CALL(provider_, IsInitializationComplete(_))
.WillRepeatedly(Return(true));
policy::BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_);
@@ -160,7 +160,7 @@ class EasyUnlockServiceNoBluetoothTest : public EasyUnlockServiceTest {
virtual ~EasyUnlockServiceNoBluetoothTest() {}
// InProcessBrowserTest:
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+ virtual void SetUpInProcessBrowserTestFixture() override {
set_is_bluetooth_adapter_present(false);
EasyUnlockServiceTest::SetUpInProcessBrowserTestFixture();
}
@@ -182,7 +182,7 @@ class EasyUnlockServiceFinchEnabledTest : public EasyUnlockServiceTest {
virtual ~EasyUnlockServiceFinchEnabledTest() {}
// InProcessBrowserTest:
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) override {
command_line->AppendSwitchASCII(switches::kForceFieldTrials,
"EasyUnlock/Enable/");
}
@@ -218,7 +218,7 @@ class EasyUnlockServiceFinchDisabledTest : public EasyUnlockServiceTest {
virtual ~EasyUnlockServiceFinchDisabledTest() {}
// InProcessBrowserTest:
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) override {
command_line->AppendSwitchASCII(switches::kForceFieldTrials,
"EasyUnlock/Disable/");
}
@@ -250,7 +250,7 @@ class EasyUnlockServiceMultiProfileTest : public LoginManagerTest {
virtual ~EasyUnlockServiceMultiProfileTest() {}
// InProcessBrowserTest:
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+ virtual void SetUpInProcessBrowserTestFixture() override {
LoginManagerTest::SetUpInProcessBrowserTestFixture();
mock_adapter_ = new testing::NiceMock<MockBluetoothAdapter>();
« no previous file with comments | « chrome/browser/signin/easy_unlock_service.cc ('k') | chrome/browser/signin/easy_unlock_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698