| Index: chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
|
| index 04deab813cf4d80d35174d73b170d5798c857d61..a262db0495eddd7170cfd42f73abedb7c12df015 100644
|
| --- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
|
| +++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
|
| @@ -21,7 +21,7 @@ class TestChromeLauncherController : public ChromeLauncherController {
|
| public:
|
| TestChromeLauncherController(Profile* profile, ash::ShelfModel* model)
|
| : ChromeLauncherController(profile, model) {}
|
| - virtual bool IsLoggedInAsGuest() OVERRIDE {
|
| + virtual bool IsLoggedInAsGuest() override {
|
| return false;
|
| }
|
| private:
|
| @@ -38,13 +38,13 @@ class LauncherContextMenuTest : public ash::test::AshTestBase {
|
| LauncherContextMenuTest()
|
| : profile_(new TestingProfile()) {}
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| ash::test::AshTestBase::SetUp();
|
| controller_.reset(
|
| new TestChromeLauncherController(profile(), &shelf_model_));
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| controller_.reset(NULL);
|
| ash::test::AshTestBase::TearDown();
|
| }
|
|
|