Chromium Code Reviews| 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 dbcf723fea0d10d48cd71428f9d4b6e577d649b7..6edf52468a5174f15f85aa3f7522de93af74cac1 100644 |
| --- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc |
| +++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc |
| @@ -13,21 +13,18 @@ |
| #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
| -#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h" |
| #include "chrome/test/base/testing_profile.h" |
| #include "ui/aura/root_window.h" |
| -class TestChromeLauncherControllerPerBrowser : |
| - public ChromeLauncherControllerPerBrowser { |
| +class TestChromeLauncherController : public ChromeLauncherController { |
| public: |
| - TestChromeLauncherControllerPerBrowser( |
| - Profile* profile, ash::LauncherModel* model) |
| - : ChromeLauncherControllerPerBrowser(profile, model) {} |
| + TestChromeLauncherController(Profile* profile, ash::LauncherModel* model) |
| + : ChromeLauncherController(profile, model) {} |
| virtual bool IsLoggedInAsGuest() OVERRIDE { |
| return false; |
| } |
| private: |
| - DISALLOW_COPY_AND_ASSIGN(TestChromeLauncherControllerPerBrowser); |
| + DISALLOW_COPY_AND_ASSIGN(TestChromeLauncherController); |
| }; |
| class LauncherContextMenuTest : public ash::test::AshTestBase { |
| @@ -43,7 +40,7 @@ class LauncherContextMenuTest : public ash::test::AshTestBase { |
| virtual void SetUp() OVERRIDE { |
| ash::test::AshTestBase::SetUp(); |
| controller_.reset( |
| - new TestChromeLauncherControllerPerBrowser(profile(), |
| + new TestChromeLauncherController(profile(), |
| &launcher_model_)); |
|
Mr4D (OOO till 08-26)
2013/08/19 16:13:56
Please one line.
simonhong_
2013/08/19 21:00:57
Done.
|
| } |