| Index: chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| index 89e98985e6eb79bdb7148ad8ab58dfe2eff72595..55fe1f8d10470cd09867b0bf80a882b3c3369e35 100644
|
| --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| @@ -402,7 +402,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
|
|
|
| virtual ~DeviceLocalAccountTest() {}
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| // Configure and start the test server.
|
| scoped_ptr<crypto::RSAPrivateKey> signing_key(
|
| PolicyBuilder::CreateTestSigningKey());
|
| @@ -418,7 +418,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
|
| DevicePolicyCrosBrowserTest::SetUp();
|
| }
|
|
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| DevicePolicyCrosBrowserTest::SetUpCommandLine(command_line);
|
| command_line->AppendSwitch(chromeos::switches::kLoginManager);
|
| command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
|
| @@ -427,7 +427,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
|
| test_server_.GetServiceURL().spec());
|
| }
|
|
|
| - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
|
| + virtual void SetUpInProcessBrowserTestFixture() override {
|
| DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
|
|
|
| // Clear command-line arguments (but keep command-line switches) so the
|
| @@ -444,7 +444,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
|
| InitializePolicy();
|
| }
|
|
|
| - virtual void SetUpOnMainThread() OVERRIDE {
|
| + virtual void SetUpOnMainThread() override {
|
| DevicePolicyCrosBrowserTest::SetUpOnMainThread();
|
|
|
| initial_locale_ = g_browser_process->GetApplicationLocale();
|
| @@ -500,7 +500,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
|
| wizard_controller->SkipToLoginForTesting(LoginScreenContext());
|
| }
|
|
|
| - virtual void TearDownOnMainThread() OVERRIDE {
|
| + virtual void TearDownOnMainThread() override {
|
| BrowserList::RemoveObserver(this);
|
|
|
| // This shuts down the login UI.
|
| @@ -510,22 +510,22 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest,
|
| }
|
|
|
| virtual void LocalStateChanged(
|
| - user_manager::UserManager* user_manager) OVERRIDE {
|
| + user_manager::UserManager* user_manager) override {
|
| if (run_loop_)
|
| run_loop_->Quit();
|
| }
|
|
|
| - virtual void OnBrowserRemoved(Browser* browser) OVERRIDE {
|
| + virtual void OnBrowserRemoved(Browser* browser) override {
|
| if (run_loop_)
|
| run_loop_->Quit();
|
| }
|
|
|
| - virtual void OnAppWindowAdded(extensions::AppWindow* app_window) OVERRIDE {
|
| + virtual void OnAppWindowAdded(extensions::AppWindow* app_window) override {
|
| if (run_loop_)
|
| run_loop_->Quit();
|
| }
|
|
|
| - virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) OVERRIDE {
|
| + virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) override {
|
| if (run_loop_)
|
| run_loop_->Quit();
|
| }
|
|
|