| Index: chrome/browser/chromeos/login/crash_restore_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/crash_restore_browsertest.cc b/chrome/browser/chromeos/login/crash_restore_browsertest.cc
|
| index e3185a129e29e2188252ddc6f996ced3296eb83c..b4f810461f944bc9c73a2d6d65e5aba1045003de 100644
|
| --- a/chrome/browser/chromeos/login/crash_restore_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/crash_restore_browsertest.cc
|
| @@ -35,16 +35,16 @@ class CrashRestoreSimpleTest : public InProcessBrowserTest {
|
| protected:
|
| CrashRestoreSimpleTest() {}
|
|
|
| - virtual ~CrashRestoreSimpleTest() {}
|
| + ~CrashRestoreSimpleTest() override {}
|
|
|
| - virtual void SetUpCommandLine(base::CommandLine* command_line) override {
|
| + void SetUpCommandLine(base::CommandLine* command_line) override {
|
| command_line->AppendSwitchASCII(switches::kLoginUser, kUserId1);
|
| command_line->AppendSwitchASCII(
|
| switches::kLoginProfile,
|
| CryptohomeClient::GetStubSanitizedUsername(kUserId1));
|
| }
|
|
|
| - virtual void SetUpInProcessBrowserTestFixture() override {
|
| + void SetUpInProcessBrowserTestFixture() override {
|
| // Redirect session_manager DBus calls to FakeSessionManagerClient.
|
| session_manager_client_ = new FakeSessionManagerClient;
|
| chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
|
| @@ -75,9 +75,9 @@ class UserSessionRestoreObserver : public UserSessionStateObserver {
|
| if (!user_sessions_restored_)
|
| UserSessionManager::GetInstance()->AddSessionStateObserver(this);
|
| }
|
| - virtual ~UserSessionRestoreObserver() {}
|
| + ~UserSessionRestoreObserver() override {}
|
|
|
| - virtual void PendingUserSessionsRestoreFinished() override {
|
| + void PendingUserSessionsRestoreFinished() override {
|
| user_sessions_restored_ = true;
|
| UserSessionManager::GetInstance()->RemoveSessionStateObserver(this);
|
| if (!running_loop_)
|
| @@ -110,9 +110,9 @@ class UserSessionRestoreObserver : public UserSessionStateObserver {
|
| class CrashRestoreComplexTest : public CrashRestoreSimpleTest {
|
| protected:
|
| CrashRestoreComplexTest() {}
|
| - virtual ~CrashRestoreComplexTest() {}
|
| + ~CrashRestoreComplexTest() override {}
|
|
|
| - virtual void SetUpInProcessBrowserTestFixture() override {
|
| + void SetUpInProcessBrowserTestFixture() override {
|
| CrashRestoreSimpleTest::SetUpInProcessBrowserTestFixture();
|
| session_manager_client_->StartSession(kUserId2);
|
| session_manager_client_->StartSession(kUserId3);
|
|
|