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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 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/history/history_types.cc ('k') | chrome/browser/history/in_memory_url_index_cache.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/history_unittest.cc
diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc
index 13b6aa19ebbf0fd20255451c1a7f6e0bdc08feca..a4fdf6be97ccd5064d4f38877352f51092c275c4 100644
--- a/chrome/browser/history/history_unittest.cc
+++ b/chrome/browser/history/history_unittest.cc
@@ -1119,7 +1119,7 @@ TEST_F(HistoryTest, AddPage) {
const GURL test_url("http://www.google.com/");
history_service_->AddPage(test_url, base::Time::Now(), NULL, 0, GURL(),
history::RedirectList(),
- content::PAGE_TRANSITION_MANUAL_SUBFRAME,
+ ui::PAGE_TRANSITION_MANUAL_SUBFRAME,
history::SOURCE_BROWSED, false);
EXPECT_TRUE(QueryURL(history_service_.get(), test_url));
EXPECT_EQ(1, query_url_row_.visit_count());
@@ -1128,7 +1128,7 @@ TEST_F(HistoryTest, AddPage) {
// Add the page once from the main frame (should unhide it).
history_service_->AddPage(test_url, base::Time::Now(), NULL, 0, GURL(),
- history::RedirectList(), content::PAGE_TRANSITION_LINK,
+ history::RedirectList(), ui::PAGE_TRANSITION_LINK,
history::SOURCE_BROWSED, false);
EXPECT_TRUE(QueryURL(history_service_.get(), test_url));
EXPECT_EQ(2, query_url_row_.visit_count()); // Added twice.
@@ -1151,7 +1151,7 @@ TEST_F(HistoryTest, AddRedirect) {
history_service_->AddPage(
first_redirects.back(), base::Time::Now(),
reinterpret_cast<ContextID>(1), 0, GURL(), first_redirects,
- content::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, true);
+ ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED, true);
// The first page should be added once with a link visit type (because we set
// LINK when we added the original URL, and a referrer of nowhere (0).
@@ -1159,8 +1159,8 @@ TEST_F(HistoryTest, AddRedirect) {
EXPECT_EQ(1, query_url_row_.visit_count());
ASSERT_EQ(1U, query_url_visits_.size());
int64 first_visit = query_url_visits_[0].visit_id;
- EXPECT_EQ(content::PAGE_TRANSITION_LINK |
- content::PAGE_TRANSITION_CHAIN_START,
+ EXPECT_EQ(ui::PAGE_TRANSITION_LINK |
+ ui::PAGE_TRANSITION_CHAIN_START,
query_url_visits_[0].transition);
EXPECT_EQ(0, query_url_visits_[0].referring_visit); // No referrer.
@@ -1170,8 +1170,8 @@ TEST_F(HistoryTest, AddRedirect) {
EXPECT_EQ(1, query_url_row_.visit_count());
ASSERT_EQ(1U, query_url_visits_.size());
int64 second_visit = query_url_visits_[0].visit_id;
- EXPECT_EQ(content::PAGE_TRANSITION_SERVER_REDIRECT |
- content::PAGE_TRANSITION_CHAIN_END,
+ EXPECT_EQ(ui::PAGE_TRANSITION_SERVER_REDIRECT |
+ ui::PAGE_TRANSITION_CHAIN_END,
query_url_visits_[0].transition);
EXPECT_EQ(first_visit, query_url_visits_[0].referring_visit);
@@ -1190,9 +1190,9 @@ TEST_F(HistoryTest, AddRedirect) {
history_service_->AddPage(second_redirects[1], base::Time::Now(),
reinterpret_cast<ContextID>(1), 1,
second_redirects[0], second_redirects,
- static_cast<content::PageTransition>(
- content::PAGE_TRANSITION_LINK |
- content::PAGE_TRANSITION_CLIENT_REDIRECT),
+ ui::PageTransitionFromInt(
+ ui::PAGE_TRANSITION_LINK |
+ ui::PAGE_TRANSITION_CLIENT_REDIRECT),
history::SOURCE_BROWSED, true);
// The last page (source of the client redirect) should NOT have an
@@ -1205,8 +1205,8 @@ TEST_F(HistoryTest, AddRedirect) {
EXPECT_TRUE(QueryURL(history_service_.get(), second_redirects[1]));
EXPECT_EQ(1, query_url_row_.visit_count());
ASSERT_EQ(1U, query_url_visits_.size());
- EXPECT_EQ(content::PAGE_TRANSITION_CLIENT_REDIRECT |
- content::PAGE_TRANSITION_CHAIN_END,
+ EXPECT_EQ(ui::PAGE_TRANSITION_CLIENT_REDIRECT |
+ ui::PAGE_TRANSITION_CHAIN_END,
query_url_visits_[0].transition);
EXPECT_EQ(second_visit, query_url_visits_[0].referring_visit);
}
@@ -1219,14 +1219,14 @@ TEST_F(HistoryTest, MakeIntranetURLsTyped) {
const GURL test_url("http://intranet_host/path");
history_service_->AddPage(
test_url, base::Time::Now(), NULL, 0, GURL(),
- history::RedirectList(), content::PAGE_TRANSITION_LINK,
+ history::RedirectList(), ui::PAGE_TRANSITION_LINK,
history::SOURCE_BROWSED, false);
EXPECT_TRUE(QueryURL(history_service_.get(), test_url));
EXPECT_EQ(1, query_url_row_.visit_count());
EXPECT_EQ(1, query_url_row_.typed_count());
ASSERT_EQ(1U, query_url_visits_.size());
- EXPECT_EQ(content::PAGE_TRANSITION_TYPED,
- content::PageTransitionStripQualifier(query_url_visits_[0].transition));
+ EXPECT_EQ(ui::PAGE_TRANSITION_TYPED,
+ ui::PageTransitionStripQualifier(query_url_visits_[0].transition));
// Add more visits on the same host. None of these should be promoted since
// there is already a typed visit.
@@ -1235,66 +1235,66 @@ TEST_F(HistoryTest, MakeIntranetURLsTyped) {
const GURL test_url2("http://intranet_host/different_path");
history_service_->AddPage(
test_url2, base::Time::Now(), NULL, 0, GURL(),
- history::RedirectList(), content::PAGE_TRANSITION_LINK,
+ history::RedirectList(), ui::PAGE_TRANSITION_LINK,
history::SOURCE_BROWSED, false);
EXPECT_TRUE(QueryURL(history_service_.get(), test_url2));
EXPECT_EQ(1, query_url_row_.visit_count());
EXPECT_EQ(0, query_url_row_.typed_count());
ASSERT_EQ(1U, query_url_visits_.size());
- EXPECT_EQ(content::PAGE_TRANSITION_LINK,
- content::PageTransitionStripQualifier(query_url_visits_[0].transition));
+ EXPECT_EQ(ui::PAGE_TRANSITION_LINK,
+ ui::PageTransitionStripQualifier(query_url_visits_[0].transition));
// No path.
const GURL test_url3("http://intranet_host/");
history_service_->AddPage(
test_url3, base::Time::Now(), NULL, 0, GURL(),
- history::RedirectList(), content::PAGE_TRANSITION_LINK,
+ history::RedirectList(), ui::PAGE_TRANSITION_LINK,
history::SOURCE_BROWSED, false);
EXPECT_TRUE(QueryURL(history_service_.get(), test_url3));
EXPECT_EQ(1, query_url_row_.visit_count());
EXPECT_EQ(0, query_url_row_.typed_count());
ASSERT_EQ(1U, query_url_visits_.size());
- EXPECT_EQ(content::PAGE_TRANSITION_LINK,
- content::PageTransitionStripQualifier(query_url_visits_[0].transition));
+ EXPECT_EQ(ui::PAGE_TRANSITION_LINK,
+ ui::PageTransitionStripQualifier(query_url_visits_[0].transition));
// Different scheme.
const GURL test_url4("https://intranet_host/");
history_service_->AddPage(
test_url4, base::Time::Now(), NULL, 0, GURL(),
- history::RedirectList(), content::PAGE_TRANSITION_LINK,
+ history::RedirectList(), ui::PAGE_TRANSITION_LINK,
history::SOURCE_BROWSED, false);
EXPECT_TRUE(QueryURL(history_service_.get(), test_url4));
EXPECT_EQ(1, query_url_row_.visit_count());
EXPECT_EQ(0, query_url_row_.typed_count());
ASSERT_EQ(1U, query_url_visits_.size());
- EXPECT_EQ(content::PAGE_TRANSITION_LINK,
- content::PageTransitionStripQualifier(query_url_visits_[0].transition));
+ EXPECT_EQ(ui::PAGE_TRANSITION_LINK,
+ ui::PageTransitionStripQualifier(query_url_visits_[0].transition));
// Different transition.
const GURL test_url5("http://intranet_host/another_path");
history_service_->AddPage(
test_url5, base::Time::Now(), NULL, 0, GURL(),
history::RedirectList(),
- content::PAGE_TRANSITION_AUTO_BOOKMARK,
+ ui::PAGE_TRANSITION_AUTO_BOOKMARK,
history::SOURCE_BROWSED, false);
EXPECT_TRUE(QueryURL(history_service_.get(), test_url5));
EXPECT_EQ(1, query_url_row_.visit_count());
EXPECT_EQ(0, query_url_row_.typed_count());
ASSERT_EQ(1U, query_url_visits_.size());
- EXPECT_EQ(content::PAGE_TRANSITION_AUTO_BOOKMARK,
- content::PageTransitionStripQualifier(query_url_visits_[0].transition));
+ EXPECT_EQ(ui::PAGE_TRANSITION_AUTO_BOOKMARK,
+ ui::PageTransitionStripQualifier(query_url_visits_[0].transition));
// Original URL.
history_service_->AddPage(
test_url, base::Time::Now(), NULL, 0, GURL(),
- history::RedirectList(), content::PAGE_TRANSITION_LINK,
+ history::RedirectList(), ui::PAGE_TRANSITION_LINK,
history::SOURCE_BROWSED, false);
EXPECT_TRUE(QueryURL(history_service_.get(), test_url));
EXPECT_EQ(2, query_url_row_.visit_count());
EXPECT_EQ(1, query_url_row_.typed_count());
ASSERT_EQ(2U, query_url_visits_.size());
- EXPECT_EQ(content::PAGE_TRANSITION_LINK,
- content::PageTransitionStripQualifier(query_url_visits_[1].transition));
+ EXPECT_EQ(ui::PAGE_TRANSITION_LINK,
+ ui::PageTransitionStripQualifier(query_url_visits_[1].transition));
}
TEST_F(HistoryTest, Typed) {
@@ -1306,7 +1306,7 @@ TEST_F(HistoryTest, Typed) {
const GURL test_url("http://www.google.com/");
history_service_->AddPage(
test_url, base::Time::Now(), context_id, 0, GURL(),
- history::RedirectList(), content::PAGE_TRANSITION_TYPED,
+ history::RedirectList(), ui::PAGE_TRANSITION_TYPED,
history::SOURCE_BROWSED, false);
EXPECT_TRUE(QueryURL(history_service_.get(), test_url));
@@ -1317,7 +1317,7 @@ TEST_F(HistoryTest, Typed) {
// Add the page again not typed.
history_service_->AddPage(
test_url, base::Time::Now(), context_id, 0, GURL(),
- history::RedirectList(), content::PAGE_TRANSITION_LINK,
+ history::RedirectList(), ui::PAGE_TRANSITION_LINK,
history::SOURCE_BROWSED, false);
EXPECT_TRUE(QueryURL(history_service_.get(), test_url));
@@ -1328,7 +1328,7 @@ TEST_F(HistoryTest, Typed) {
// Add the page again as a generated URL.
history_service_->AddPage(
test_url, base::Time::Now(), context_id, 0, GURL(),
- history::RedirectList(), content::PAGE_TRANSITION_GENERATED,
+ history::RedirectList(), ui::PAGE_TRANSITION_GENERATED,
history::SOURCE_BROWSED, false);
EXPECT_TRUE(QueryURL(history_service_.get(), test_url));
@@ -1339,7 +1339,7 @@ TEST_F(HistoryTest, Typed) {
// Add the page again as a reload.
history_service_->AddPage(
test_url, base::Time::Now(), context_id, 0, GURL(),
- history::RedirectList(), content::PAGE_TRANSITION_RELOAD,
+ history::RedirectList(), ui::PAGE_TRANSITION_RELOAD,
history::SOURCE_BROWSED, false);
EXPECT_TRUE(QueryURL(history_service_.get(), test_url));
@@ -1391,11 +1391,11 @@ TEST_F(HistoryTest, MostVisitedURLs) {
// Add two pages.
history_service_->AddPage(
url0, base::Time::Now(), context_id, 0, GURL(),
- history::RedirectList(), content::PAGE_TRANSITION_TYPED,
+ history::RedirectList(), ui::PAGE_TRANSITION_TYPED,
history::SOURCE_BROWSED, false);
history_service_->AddPage(
url1, base::Time::Now(), context_id, 0, GURL(),
- history::RedirectList(), content::PAGE_TRANSITION_TYPED,
+ history::RedirectList(), ui::PAGE_TRANSITION_TYPED,
history::SOURCE_BROWSED, false);
history_service_->QueryMostVisitedURLs(
20,
@@ -1412,7 +1412,7 @@ TEST_F(HistoryTest, MostVisitedURLs) {
// Add another page.
history_service_->AddPage(
url2, base::Time::Now(), context_id, 0, GURL(),
- history::RedirectList(), content::PAGE_TRANSITION_TYPED,
+ history::RedirectList(), ui::PAGE_TRANSITION_TYPED,
history::SOURCE_BROWSED, false);
history_service_->QueryMostVisitedURLs(
20,
@@ -1430,7 +1430,7 @@ TEST_F(HistoryTest, MostVisitedURLs) {
// Revisit url2, making it the top URL.
history_service_->AddPage(
url2, base::Time::Now(), context_id, 0, GURL(),
- history::RedirectList(), content::PAGE_TRANSITION_TYPED,
+ history::RedirectList(), ui::PAGE_TRANSITION_TYPED,
history::SOURCE_BROWSED, false);
history_service_->QueryMostVisitedURLs(
20,
@@ -1448,7 +1448,7 @@ TEST_F(HistoryTest, MostVisitedURLs) {
// Revisit url1, making it the top URL.
history_service_->AddPage(
url1, base::Time::Now(), context_id, 0, GURL(),
- history::RedirectList(), content::PAGE_TRANSITION_TYPED,
+ history::RedirectList(), ui::PAGE_TRANSITION_TYPED,
history::SOURCE_BROWSED, false);
history_service_->QueryMostVisitedURLs(
20,
@@ -1471,7 +1471,7 @@ TEST_F(HistoryTest, MostVisitedURLs) {
// Visit url4 using redirects.
history_service_->AddPage(
url4, base::Time::Now(), context_id, 0, GURL(),
- redirects, content::PAGE_TRANSITION_TYPED,
+ redirects, ui::PAGE_TRANSITION_TYPED,
history::SOURCE_BROWSED, false);
history_service_->QueryMostVisitedURLs(
20,
@@ -1576,7 +1576,7 @@ TEST_F(HistoryTest, ProcessLocalDeleteDirectiveSyncOnline) {
base::Time::UnixEpoch() + base::TimeDelta::FromMicroseconds(i);
history_service_->AddPage(test_url, t, NULL, 0, GURL(),
history::RedirectList(),
- content::PAGE_TRANSITION_LINK,
+ ui::PAGE_TRANSITION_LINK,
history::SOURCE_BROWSED, false);
}
@@ -1641,7 +1641,7 @@ TEST_F(HistoryTest, ProcessGlobalIdDeleteDirective) {
base::Time::UnixEpoch() + base::TimeDelta::FromMicroseconds(i);
history_service_->AddPage(test_url, t, NULL, 0, GURL(),
history::RedirectList(),
- content::PAGE_TRANSITION_LINK,
+ ui::PAGE_TRANSITION_LINK,
history::SOURCE_BROWSED, false);
}
@@ -1732,7 +1732,7 @@ TEST_F(HistoryTest, ProcessTimeRangeDeleteDirective) {
base::Time::UnixEpoch() + base::TimeDelta::FromMicroseconds(i);
history_service_->AddPage(test_url, t, NULL, 0, GURL(),
history::RedirectList(),
- content::PAGE_TRANSITION_LINK,
+ ui::PAGE_TRANSITION_LINK,
history::SOURCE_BROWSED, false);
}
« no previous file with comments | « chrome/browser/history/history_types.cc ('k') | chrome/browser/history/in_memory_url_index_cache.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698