| Index: extensions/shell/browser/shell_desktop_controller_unittest.cc
|
| diff --git a/extensions/shell/browser/shell_desktop_controller_unittest.cc b/extensions/shell/browser/shell_desktop_controller_unittest.cc
|
| index b62e6e805afad0cec53673790b70e38e11e0b79d..b5cac17792415cc04e7dbabf383fefbf059bbff7 100644
|
| --- a/extensions/shell/browser/shell_desktop_controller_unittest.cc
|
| +++ b/extensions/shell/browser/shell_desktop_controller_unittest.cc
|
| @@ -26,7 +26,7 @@ class ShellDesktopControllerTest : public aura::test::AuraTestBase {
|
| }
|
| virtual ~ShellDesktopControllerTest() {}
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| #if defined(OS_CHROMEOS)
|
| scoped_ptr<chromeos::DBusThreadManagerSetter> dbus_setter =
|
| chromeos::DBusThreadManager::GetSetterForTesting();
|
| @@ -38,7 +38,7 @@ class ShellDesktopControllerTest : public aura::test::AuraTestBase {
|
| controller_.reset(new ShellDesktopController());
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| controller_.reset();
|
| aura::test::AuraTestBase::TearDown();
|
| #if defined(OS_CHROMEOS)
|
|
|