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

Unified Diff: chrome/browser/ui/sync/one_click_signin_helper_unittest.cc

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/ui/sync/one_click_signin_helper_unittest.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
index bf982c3b51aad8302341e93a1ad521ff9aa1f89c..812131e1a1987c8d959b9d476cbeb4283dd15b22 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
@@ -115,11 +115,11 @@ class TestProfileIOData : public ProfileIOData {
ProfileParams* profile_params,
content::ProtocolHandlerMap* protocol_handlers,
content::URLRequestInterceptorScopedVector request_interceptors)
- const OVERRIDE {
+ const override {
NOTREACHED();
}
virtual void InitializeExtensionsRequestContext(
- ProfileParams* profile_params) const OVERRIDE {
+ ProfileParams* profile_params) const override {
NOTREACHED();
}
virtual net::URLRequestContext* InitializeAppRequestContext(
@@ -129,18 +129,18 @@ class TestProfileIOData : public ProfileIOData {
protocol_handler_interceptor,
content::ProtocolHandlerMap* protocol_handlers,
content::URLRequestInterceptorScopedVector request_interceptors)
- const OVERRIDE {
+ const override {
NOTREACHED();
return NULL;
}
virtual net::URLRequestContext* InitializeMediaRequestContext(
net::URLRequestContext* original_context,
- const StoragePartitionDescriptor& details) const OVERRIDE {
+ const StoragePartitionDescriptor& details) const override {
NOTREACHED();
return NULL;
}
virtual net::URLRequestContext*
- AcquireMediaRequestContext() const OVERRIDE {
+ AcquireMediaRequestContext() const override {
NOTREACHED();
return NULL;
}
@@ -151,7 +151,7 @@ class TestProfileIOData : public ProfileIOData {
protocol_handler_interceptor,
content::ProtocolHandlerMap* protocol_handlers,
content::URLRequestInterceptorScopedVector request_interceptors)
- const OVERRIDE {
+ const override {
NOTREACHED();
return NULL;
}
@@ -159,7 +159,7 @@ class TestProfileIOData : public ProfileIOData {
AcquireIsolatedMediaRequestContext(
net::URLRequestContext* app_context,
const StoragePartitionDescriptor& partition_descriptor)
- const OVERRIDE {
+ const override {
NOTREACHED();
return NULL;
}
@@ -182,11 +182,11 @@ class OneClickTestProfileSyncService : public TestProfileSyncService {
}
// Need to control this for certain tests.
- virtual bool FirstSetupInProgress() const OVERRIDE {
+ virtual bool FirstSetupInProgress() const override {
return first_setup_in_progress_;
}
- virtual bool sync_initialized() const OVERRIDE { return sync_initialized_; }
+ virtual bool sync_initialized() const override { return sync_initialized_; }
// Controls return value of FirstSetupInProgress. Because some bits
// of UI depend on that value, it's useful to control it separately
@@ -222,8 +222,8 @@ class OneClickSigninHelperTest : public ChromeRenderViewHostTestHarness {
public:
OneClickSigninHelperTest();
- virtual void SetUp() OVERRIDE;
- virtual void TearDown() OVERRIDE;
+ virtual void SetUp() override;
+ virtual void TearDown() override;
// Sets up the sign-in manager for tests. If |username| is
// is not empty, the profile of the mock WebContents will be connected to
@@ -248,7 +248,7 @@ class OneClickSigninHelperTest : public ChromeRenderViewHostTestHarness {
private:
// ChromeRenderViewHostTestHarness overrides:
- virtual content::BrowserContext* CreateBrowserContext() OVERRIDE;
+ virtual content::BrowserContext* CreateBrowserContext() override;
// The ID of the signin process the test will assume to be trusted.
// By default, set to the test RenderProcessHost's process ID, but
@@ -348,7 +348,7 @@ class OneClickSigninHelperIOTest : public OneClickSigninHelperTest {
public:
OneClickSigninHelperIOTest();
- virtual void SetUp() OVERRIDE;
+ virtual void SetUp() override;
TestProfileIOData* CreateTestProfileIOData(Profile::ProfileType profile_type);
@@ -387,7 +387,7 @@ TestProfileIOData* OneClickSigninHelperIOTest::CreateTestProfileIOData(
class OneClickSigninHelperIncognitoTest : public OneClickSigninHelperTest {
protected:
// content::RenderViewHostTestHarness.
- virtual content::BrowserContext* CreateBrowserContext() OVERRIDE;
+ virtual content::BrowserContext* CreateBrowserContext() override;
};
content::BrowserContext*
@@ -862,12 +862,12 @@ MockStarterWrapper::MockStarterWrapper(
class OneClickSyncStarterWrapperTest : public testing::Test {
public:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
TestingProfile::Builder builder;
profile_ = builder.Build();
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
// Let the SyncStarterWrapper delete itself.
base::RunLoop().RunUntilIdle();
}
« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_helper.cc ('k') | chrome/browser/ui/sync/one_click_signin_sync_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698