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

Unified Diff: chrome/browser/history/visit_database_unittest.cc

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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/history/visit_database.cc ('k') | chrome/browser/importer/importer_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/visit_database_unittest.cc
===================================================================
--- chrome/browser/history/visit_database_unittest.cc (revision 105162)
+++ chrome/browser/history/visit_database_unittest.cc (working copy)
@@ -69,19 +69,19 @@
TEST_F(VisitDatabaseTest, Add) {
// Add one visit.
- VisitRow visit_info1(1, Time::Now(), 0, PageTransition::LINK, 0);
+ VisitRow visit_info1(1, Time::Now(), 0, content::PAGE_TRANSITION_LINK, 0);
EXPECT_TRUE(AddVisit(&visit_info1, SOURCE_BROWSED));
// Add second visit for the same page.
VisitRow visit_info2(visit_info1.url_id,
visit_info1.visit_time + TimeDelta::FromSeconds(1), 1,
- PageTransition::TYPED, 0);
+ content::PAGE_TRANSITION_TYPED, 0);
EXPECT_TRUE(AddVisit(&visit_info2, SOURCE_BROWSED));
// Add third visit for a different page.
VisitRow visit_info3(2,
visit_info1.visit_time + TimeDelta::FromSeconds(2), 0,
- PageTransition::LINK, 0);
+ content::PAGE_TRANSITION_LINK, 0);
EXPECT_TRUE(AddVisit(&visit_info3, SOURCE_BROWSED));
// Query the first two.
@@ -100,17 +100,17 @@
// should link them.
static const int kTime1 = 1000;
VisitRow visit_info1(1, Time::FromInternalValue(kTime1), 0,
- PageTransition::LINK, 0);
+ content::PAGE_TRANSITION_LINK, 0);
EXPECT_TRUE(AddVisit(&visit_info1, SOURCE_BROWSED));
static const int kTime2 = kTime1 + 1;
VisitRow visit_info2(1, Time::FromInternalValue(kTime2),
- visit_info1.visit_id, PageTransition::LINK, 0);
+ visit_info1.visit_id, content::PAGE_TRANSITION_LINK, 0);
EXPECT_TRUE(AddVisit(&visit_info2, SOURCE_BROWSED));
static const int kTime3 = kTime2 + 1;
VisitRow visit_info3(1, Time::FromInternalValue(kTime3),
- visit_info2.visit_id, PageTransition::LINK, 0);
+ visit_info2.visit_id, content::PAGE_TRANSITION_LINK, 0);
EXPECT_TRUE(AddVisit(&visit_info3, SOURCE_BROWSED));
// First make sure all the visits are there.
@@ -136,13 +136,13 @@
TEST_F(VisitDatabaseTest, Update) {
// Make something in the database.
- VisitRow original(1, Time::Now(), 23, 22, 19);
+ VisitRow original(1, Time::Now(), 23, content::PageTransitionFromInt(0), 19);
AddVisit(&original, SOURCE_BROWSED);
// Mutate that row.
VisitRow modification(original);
modification.url_id = 2;
- modification.transition = PageTransition::TYPED;
+ modification.transition = content::PAGE_TRANSITION_TYPED;
modification.visit_time = Time::Now() + TimeDelta::FromDays(1);
modification.referring_visit = 9292;
modification.is_indexed = true;
@@ -159,9 +159,10 @@
TEST_F(VisitDatabaseTest, GetVisibleVisitsInRange) {
// Add one visit.
VisitRow visit_info1(1, Time::Now(), 0,
- static_cast<PageTransition::Type>(PageTransition::LINK |
- PageTransition::CHAIN_START |
- PageTransition::CHAIN_END),
+ static_cast<content::PageTransition>(
+ content::PAGE_TRANSITION_LINK |
+ content::PAGE_TRANSITION_CHAIN_START |
+ content::PAGE_TRANSITION_CHAIN_END),
0);
visit_info1.visit_id = 1;
EXPECT_TRUE(AddVisit(&visit_info1, SOURCE_BROWSED));
@@ -169,9 +170,10 @@
// Add second visit for the same page.
VisitRow visit_info2(visit_info1.url_id,
visit_info1.visit_time + TimeDelta::FromSeconds(1), 1,
- static_cast<PageTransition::Type>(PageTransition::TYPED |
- PageTransition::CHAIN_START |
- PageTransition::CHAIN_END),
+ static_cast<content::PageTransition>(
+ content::PAGE_TRANSITION_TYPED |
+ content::PAGE_TRANSITION_CHAIN_START |
+ content::PAGE_TRANSITION_CHAIN_END),
0);
visit_info2.visit_id = 2;
EXPECT_TRUE(AddVisit(&visit_info2, SOURCE_BROWSED));
@@ -179,8 +181,9 @@
// Add third visit for a different page.
VisitRow visit_info3(2,
visit_info1.visit_time + TimeDelta::FromSeconds(2), 0,
- static_cast<PageTransition::Type>(PageTransition::LINK |
- PageTransition::CHAIN_START),
+ static_cast<content::PageTransition>(
+ content::PAGE_TRANSITION_LINK |
+ content::PAGE_TRANSITION_CHAIN_START),
0);
visit_info3.visit_id = 3;
EXPECT_TRUE(AddVisit(&visit_info3, SOURCE_BROWSED));
@@ -188,8 +191,9 @@
// Add a redirect visit from the last page.
VisitRow visit_info4(3,
visit_info1.visit_time + TimeDelta::FromSeconds(3), visit_info3.visit_id,
- static_cast<PageTransition::Type>(PageTransition::SERVER_REDIRECT |
- PageTransition::CHAIN_END),
+ static_cast<content::PageTransition>(
+ content::PAGE_TRANSITION_SERVER_REDIRECT |
+ content::PAGE_TRANSITION_CHAIN_END),
0);
visit_info4.visit_id = 4;
EXPECT_TRUE(AddVisit(&visit_info4, SOURCE_BROWSED));
@@ -197,9 +201,10 @@
// Add a subframe visit.
VisitRow visit_info5(4,
visit_info1.visit_time + TimeDelta::FromSeconds(4), visit_info4.visit_id,
- static_cast<PageTransition::Type>(PageTransition::AUTO_SUBFRAME |
- PageTransition::CHAIN_START |
- PageTransition::CHAIN_END),
+ static_cast<content::PageTransition>(
+ content::PAGE_TRANSITION_AUTO_SUBFRAME |
+ content::PAGE_TRANSITION_CHAIN_START |
+ content::PAGE_TRANSITION_CHAIN_END),
0);
visit_info5.visit_id = 5;
EXPECT_TRUE(AddVisit(&visit_info5, SOURCE_BROWSED));
@@ -227,13 +232,13 @@
TEST_F(VisitDatabaseTest, VisitSource) {
// Add visits.
- VisitRow visit_info1(111, Time::Now(), 0, PageTransition::LINK, 0);
+ VisitRow visit_info1(111, Time::Now(), 0, content::PAGE_TRANSITION_LINK, 0);
ASSERT_TRUE(AddVisit(&visit_info1, SOURCE_BROWSED));
- VisitRow visit_info2(112, Time::Now(), 1, PageTransition::TYPED, 0);
+ VisitRow visit_info2(112, Time::Now(), 1, content::PAGE_TRANSITION_TYPED, 0);
ASSERT_TRUE(AddVisit(&visit_info2, SOURCE_SYNCED));
- VisitRow visit_info3(113, Time::Now(), 0, PageTransition::TYPED, 0);
+ VisitRow visit_info3(113, Time::Now(), 0, content::PAGE_TRANSITION_TYPED, 0);
ASSERT_TRUE(AddVisit(&visit_info3, SOURCE_EXTENSION));
// Query each visit.
@@ -260,10 +265,12 @@
TEST_F(VisitDatabaseTest, GetIndexedVisits) {
// Add non-indexed visits.
int url_id = 111;
- VisitRow visit_info1(url_id, Time::Now(), 0, PageTransition::LINK, 0);
+ VisitRow visit_info1(
+ url_id, Time::Now(), 0, content::PAGE_TRANSITION_LINK, 0);
ASSERT_TRUE(AddVisit(&visit_info1, SOURCE_BROWSED));
- VisitRow visit_info2(url_id, Time::Now(), 0, PageTransition::TYPED, 0);
+ VisitRow visit_info2(
+ url_id, Time::Now(), 0, content::PAGE_TRANSITION_TYPED, 0);
ASSERT_TRUE(AddVisit(&visit_info2, SOURCE_SYNCED));
std::vector<VisitRow> visits;
@@ -272,7 +279,8 @@
EXPECT_TRUE(GetIndexedVisitsForURL(url_id, &visits));
EXPECT_EQ(static_cast<size_t>(0), visits.size());
- VisitRow visit_info3(url_id, Time::Now(), 2, PageTransition::TYPED, 0);
+ VisitRow visit_info3(
+ url_id, Time::Now(), 2, content::PAGE_TRANSITION_TYPED, 0);
visit_info3.is_indexed = true;
ASSERT_TRUE(AddVisit(&visit_info3, SOURCE_SYNCED));
EXPECT_TRUE(GetVisitsForURL(url_id, &visits));
« no previous file with comments | « chrome/browser/history/visit_database.cc ('k') | chrome/browser/importer/importer_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698