summaryrefslogtreecommitdiffstats
path: root/chrome/browser/background_page_tracker_unittest.cc
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-06-09 11:47:42 +0100
committerKristian Monsen <kristianm@google.com>2011-06-29 14:33:03 +0100
commitdc0f95d653279beabeb9817299e2902918ba123e (patch)
tree32eb121cd532053a5b9cb0c390331349af8d6baa /chrome/browser/background_page_tracker_unittest.cc
parentba160cd4054d13d0cb0b1b46e61c3bed67095811 (diff)
downloadexternal_chromium-dc0f95d653279beabeb9817299e2902918ba123e.zip
external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.gz
external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.bz2
Merge Chromium at r11.0.696.0: Initial merge by git
Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
Diffstat (limited to 'chrome/browser/background_page_tracker_unittest.cc')
-rw-r--r--chrome/browser/background_page_tracker_unittest.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/chrome/browser/background_page_tracker_unittest.cc b/chrome/browser/background_page_tracker_unittest.cc
index 74fd7ea..dcba51c 100644
--- a/chrome/browser/background_page_tracker_unittest.cc
+++ b/chrome/browser/background_page_tracker_unittest.cc
@@ -8,6 +8,8 @@
#include "chrome/browser/background_page_tracker.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/notification_type.h"
+#include "chrome/test/testing_browser_process.h"
+#include "chrome/test/testing_browser_process_test.h"
#include "chrome/test/testing_pref_service.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
@@ -25,13 +27,16 @@ class MockBackgroundPageTracker : public BackgroundPageTracker {
TestingPrefService prefs_;
};
-TEST(BackgroundPageTrackerTest, Create) {
+class BackgroundPageTrackerTest : public TestingBrowserProcessTest {
+};
+
+TEST_F(BackgroundPageTrackerTest, Create) {
MockBackgroundPageTracker tracker;
EXPECT_EQ(0, tracker.GetBackgroundPageCount());
EXPECT_EQ(0, tracker.GetUnacknowledgedBackgroundPageCount());
}
-TEST(BackgroundPageTrackerTest, OnBackgroundPageLoaded) {
+TEST_F(BackgroundPageTrackerTest, OnBackgroundPageLoaded) {
MockBackgroundPageTracker tracker;
EXPECT_EQ(0, tracker.GetBackgroundPageCount());
EXPECT_EQ(0, tracker.GetUnacknowledgedBackgroundPageCount());
@@ -56,7 +61,7 @@ TEST(BackgroundPageTrackerTest, OnBackgroundPageLoaded) {
EXPECT_EQ(0, tracker.GetUnacknowledgedBackgroundPageCount());
}
-TEST(BackgroundPageTrackerTest, AcknowledgeBackgroundPages) {
+TEST_F(BackgroundPageTrackerTest, AcknowledgeBackgroundPages) {
MockBackgroundPageTracker tracker;
EXPECT_EQ(0, tracker.GetBackgroundPageCount());
EXPECT_EQ(0, tracker.GetUnacknowledgedBackgroundPageCount());
@@ -95,7 +100,7 @@ class BadgeChangedNotificationCounter : public NotificationObserver {
NotificationRegistrar registrar_;
};
-TEST(BackgroundPageTrackerTest, TestTrackerChangedNotifications) {
+TEST_F(BackgroundPageTrackerTest, TestTrackerChangedNotifications) {
MockBackgroundPageTracker tracker;
BadgeChangedNotificationCounter counter;
std::string app1 = "app_id_1";