| Index: chrome/browser/chromeos/display/display_preferences_unittest.cc
|
| diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc
|
| index 4c63885fab6fb8b18728a45ff6318b1ee1e7a7a0..fb1387d55d2e0c083d9d282f45fc74229e459116 100644
|
| --- a/chrome/browser/chromeos/display/display_preferences_unittest.cc
|
| +++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc
|
| @@ -50,7 +50,7 @@ class DisplayPreferencesTest : public ash::test::AshTestBase {
|
|
|
| virtual ~DisplayPreferencesTest() {}
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| EXPECT_CALL(*mock_user_manager_, IsUserLoggedIn())
|
| .WillRepeatedly(testing::Return(false));
|
| EXPECT_CALL(*mock_user_manager_, Shutdown());
|
| @@ -60,7 +60,7 @@ class DisplayPreferencesTest : public ash::test::AshTestBase {
|
| observer_.reset(new DisplayConfigurationObserver());
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| observer_.reset();
|
| TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
|
| ash::test::AshTestBase::TearDown();
|
|
|