Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(670)

Unified Diff: chrome/browser/ui/views/app_list/win/test/app_list_shower_unittest.cc

Issue 24707002: Add unit tests for AppListServiceImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: un-const an iterator Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/app_list/win/app_list_shower.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/app_list/win/test/app_list_shower_unittest.cc
diff --git a/chrome/browser/ui/views/app_list/win/test/app_list_shower_unittest.cc b/chrome/browser/ui/views/app_list/win/test/app_list_shower_unittest.cc
index 1533d92a150364b6c02895643effe3f992887e08..4b425032961f3bf8de7ce8ce47b3a4c8c1a154c0 100644
--- a/chrome/browser/ui/views/app_list/win/test/app_list_shower_unittest.cc
+++ b/chrome/browser/ui/views/app_list/win/test/app_list_shower_unittest.cc
@@ -4,8 +4,9 @@
#include "base/files/file_path.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/app_list/keep_alive_service.h"
+#include "chrome/browser/ui/app_list/test/fake_keep_alive_service.h"
#include "chrome/browser/ui/app_list/test/fake_profile.h"
-#include "chrome/browser/ui/views/app_list/keep_alive_service.h"
#include "chrome/browser/ui/views/app_list/win/app_list_shower.h"
#include "chrome/browser/ui/views/app_list/win/app_list_view_factory.h"
#include "chrome/browser/ui/views/app_list/win/app_list_view_win.h"
@@ -74,26 +75,6 @@ class FakeFactory : public AppListViewFactory {
int views_created_;
};
-class FakeKeepAliveService : public KeepAliveService {
- public:
- FakeKeepAliveService()
- : keeping_alive(false) {
- }
-
- virtual ~FakeKeepAliveService() {
- }
-
- virtual void EnsureKeepAlive() OVERRIDE {
- keeping_alive = true;
- }
-
- virtual void FreeKeepAlive() OVERRIDE {
- keeping_alive = false;
- }
-
- bool keeping_alive;
-};
-
class AppListShowerUnitTest : public testing::Test {
public:
virtual void SetUp() OVERRIDE {
@@ -128,14 +109,14 @@ class AppListShowerUnitTest : public testing::Test {
TEST_F(AppListShowerUnitTest, Preconditions) {
EXPECT_FALSE(shower_->IsAppListVisible());
EXPECT_FALSE(shower_->HasView());
- EXPECT_FALSE(keep_alive_service_->keeping_alive);
+ EXPECT_FALSE(keep_alive_service_->is_keeping_alive());
}
TEST_F(AppListShowerUnitTest, ShowForProfilePutsViewOnScreen) {
shower_->ShowForProfile(profile1_.get());
EXPECT_TRUE(shower_->IsAppListVisible());
EXPECT_TRUE(shower_->HasView());
- EXPECT_TRUE(keep_alive_service_->keeping_alive);
+ EXPECT_TRUE(keep_alive_service_->is_keeping_alive());
}
TEST_F(AppListShowerUnitTest, HidingViewRemovesKeepalive) {
@@ -143,7 +124,7 @@ TEST_F(AppListShowerUnitTest, HidingViewRemovesKeepalive) {
shower_->DismissAppList();
EXPECT_FALSE(shower_->IsAppListVisible());
EXPECT_TRUE(shower_->HasView());
- EXPECT_FALSE(keep_alive_service_->keeping_alive);
+ EXPECT_FALSE(keep_alive_service_->is_keeping_alive());
}
TEST_F(AppListShowerUnitTest, HideAndShowReusesView) {
@@ -165,7 +146,7 @@ TEST_F(AppListShowerUnitTest, CloseRemovesView) {
shower_->CloseAppList();
EXPECT_FALSE(shower_->IsAppListVisible());
EXPECT_FALSE(shower_->HasView());
- EXPECT_FALSE(keep_alive_service_->keeping_alive);
+ EXPECT_FALSE(keep_alive_service_->is_keeping_alive());
}
TEST_F(AppListShowerUnitTest, SwitchingProfiles) {
« no previous file with comments | « chrome/browser/ui/views/app_list/win/app_list_shower.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698