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

Unified Diff: chrome/browser/chromeos/login/wizard_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
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/wizard_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index a369de99c23f4b57d28b3d942492119a0e9351ea..0fe3ced42edc9a224f769e86d8a57afef889cc8b 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -115,16 +115,14 @@ MATCHER_P(EnrollmentModeMatches, mode, "") {
class PrefStoreStub : public TestingPrefStore {
public:
// TestingPrefStore overrides:
- virtual PrefReadError GetReadError() const override {
+ PrefReadError GetReadError() const override {
return PersistentPrefStore::PREF_READ_ERROR_JSON_PARSE;
}
- virtual bool IsInitializationComplete() const override {
- return true;
- }
+ bool IsInitializationComplete() const override { return true; }
private:
- virtual ~PrefStoreStub() {}
+ ~PrefStoreStub() override {}
};
struct SwitchLanguageTestData {
@@ -244,9 +242,9 @@ class WizardControllerTest : public WizardInProcessBrowserTest {
protected:
WizardControllerTest() : WizardInProcessBrowserTest(
WizardController::kTestNoScreenName) {}
- virtual ~WizardControllerTest() {}
+ ~WizardControllerTest() override {}
- virtual void SetUpOnMainThread() override {
+ void SetUpOnMainThread() override {
AccessibilityManager::Get()->
SetProfileForTest(ProfileHelper::GetSigninProfile());
WizardInProcessBrowserTest::SetUpOnMainThread();
@@ -375,11 +373,10 @@ IN_PROC_BROWSER_TEST_F(WizardControllerTest, VolumeIsAdjustedForChromeVox) {
class WizardControllerTestURLFetcherFactory
: public net::TestURLFetcherFactory {
public:
- virtual net::URLFetcher* CreateURLFetcher(
- int id,
- const GURL& url,
- net::URLFetcher::RequestType request_type,
- net::URLFetcherDelegate* d) override {
+ net::URLFetcher* CreateURLFetcher(int id,
+ const GURL& url,
+ net::URLFetcher::RequestType request_type,
+ net::URLFetcherDelegate* d) override {
if (StartsWithASCII(
url.spec(),
SimpleGeolocationProvider::DefaultGeolocationProviderURL().spec(),
@@ -402,7 +399,7 @@ class WizardControllerTestURLFetcherFactory
return net::TestURLFetcherFactory::CreateURLFetcher(
id, url, request_type, d);
}
- virtual ~WizardControllerTestURLFetcherFactory() {}
+ ~WizardControllerTestURLFetcherFactory() override {}
};
class TimeZoneTestRunner {
@@ -418,7 +415,7 @@ class WizardControllerFlowTest : public WizardControllerTest {
protected:
WizardControllerFlowTest() {}
// Overriden from InProcessBrowserTest:
- virtual void SetUpOnMainThread() override {
+ void SetUpOnMainThread() override {
WizardControllerTest::SetUpOnMainThread();
// Make sure that OOBE is run as an "official" build.
@@ -478,7 +475,7 @@ class WizardControllerFlowTest : public WizardControllerTest {
WizardControllerTest::TearDownOnMainThread();
}
- virtual void TearDown() {
+ void TearDown() override {
if (fallback_fetcher_factory_) {
fetcher_factory_.reset();
net::URLFetcherImpl::set_factory(fallback_fetcher_factory_.get());
@@ -742,7 +739,7 @@ class WizardControllerDeviceStateTest : public WizardControllerFlowTest {
"2000-01");
}
- virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
WizardControllerFlowTest::SetUpCommandLine(command_line);
command_line->AppendSwitchASCII(
@@ -911,9 +908,9 @@ class WizardControllerBrokenLocalStateTest : public WizardControllerTest {
: fake_session_manager_client_(NULL) {
}
- virtual ~WizardControllerBrokenLocalStateTest() {}
+ ~WizardControllerBrokenLocalStateTest() override {}
- virtual void SetUpInProcessBrowserTestFixture() override {
+ void SetUpInProcessBrowserTestFixture() override {
WizardControllerTest::SetUpInProcessBrowserTestFixture();
fake_session_manager_client_ = new FakeSessionManagerClient;
@@ -921,7 +918,7 @@ class WizardControllerBrokenLocalStateTest : public WizardControllerTest {
scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
}
- virtual void SetUpOnMainThread() override {
+ void SetUpOnMainThread() override {
base::PrefServiceFactory factory;
factory.set_user_prefs(make_scoped_refptr(new PrefStoreStub()));
local_state_ = factory.Create(new PrefRegistrySimple()).Pass();
@@ -977,21 +974,21 @@ class WizardControllerProxyAuthOnSigninTest : public WizardControllerTest {
net::SpawnedTestServer::kLocalhost,
base::FilePath()) {
}
- virtual ~WizardControllerProxyAuthOnSigninTest() {}
+ ~WizardControllerProxyAuthOnSigninTest() override {}
// Overridden from WizardControllerTest:
- virtual void SetUp() override {
+ void SetUp() override {
ASSERT_TRUE(proxy_server_.Start());
WizardControllerTest::SetUp();
}
- virtual void SetUpOnMainThread() override {
+ void SetUpOnMainThread() override {
WizardControllerTest::SetUpOnMainThread();
WizardController::default_controller()->AdvanceToScreen(
WizardController::kNetworkScreenName);
}
- virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitchASCII(::switches::kProxyServer,
proxy_server_.host_port_pair().ToString());
}
@@ -1021,7 +1018,7 @@ class WizardControllerKioskFlowTest : public WizardControllerFlowTest {
WizardControllerKioskFlowTest() {}
// Overridden from InProcessBrowserTest:
- virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
base::FilePath test_data_dir;
ASSERT_TRUE(chromeos::test_utils::GetTestDataPath(
"app_mode", "kiosk_manifest", &test_data_dir));
@@ -1128,7 +1125,7 @@ class WizardControllerEnableDebuggingTest : public WizardControllerFlowTest {
WizardControllerEnableDebuggingTest() {}
// Overridden from InProcessBrowserTest:
- virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
WizardControllerFlowTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(chromeos::switches::kSystemDevMode);
}
@@ -1167,7 +1164,7 @@ class WizardControllerOobeResumeTest : public WizardControllerTest {
protected:
WizardControllerOobeResumeTest() {}
// Overriden from InProcessBrowserTest:
- virtual void SetUpOnMainThread() override {
+ void SetUpOnMainThread() override {
WizardControllerTest::SetUpOnMainThread();
// Make sure that OOBE is run as an "official" build.
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698