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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/history/core/browser/history_backend_unittest.cc

Issue 2298093002: Top Hosts computation should not use redirected urls and subframe urls (Closed)
Patch Set: Created 4 years, 4 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 | « no previous file | components/history/core/browser/history_database.cc » ('j') | components/history/core/browser/history_database.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/history/core/browser/history_backend_unittest.cc
diff --git a/components/history/core/browser/history_backend_unittest.cc b/components/history/core/browser/history_backend_unittest.cc
index 767e4dc17fb5835616719c46da35ba22c779aa2d..b8cd5d9647d94c61e8ef8071faf7fc712d528ef5 100644
--- a/components/history/core/browser/history_backend_unittest.cc
+++ b/components/history/core/browser/history_backend_unittest.cc
@@ -3021,8 +3021,12 @@ TEST_F(HistoryBackendTest, TopHosts) {
urls.push_back(GURL("http://cnn.com/intl"));
urls.push_back(GURL("http://dogtopia.com/"));
for (const GURL& url : urls) {
- backend_->AddPageVisit(url, base::Time::Now(), 0, ui::PAGE_TRANSITION_LINK,
- history::SOURCE_BROWSED);
+ backend_->AddPageVisit(
+ url, base::Time::Now(), 0,
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
+ ui::PAGE_TRANSITION_CHAIN_START |
+ ui::PAGE_TRANSITION_CHAIN_END),
+ history::SOURCE_BROWSED);
}
EXPECT_THAT(backend_->TopHosts(3),
@@ -3036,8 +3040,12 @@ TEST_F(HistoryBackendTest, TopHosts_ElidePortAndScheme) {
urls.push_back(GURL("https://cnn.com/intl"));
urls.push_back(GURL("http://cnn.com:567/sports"));
for (const GURL& url : urls) {
- backend_->AddPageVisit(url, base::Time::Now(), 0, ui::PAGE_TRANSITION_LINK,
- history::SOURCE_BROWSED);
+ backend_->AddPageVisit(
+ url, base::Time::Now(), 0,
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
+ ui::PAGE_TRANSITION_CHAIN_START |
+ ui::PAGE_TRANSITION_CHAIN_END),
+ history::SOURCE_BROWSED);
}
EXPECT_THAT(backend_->TopHosts(3), ElementsAre(std::make_pair("cnn.com", 3)));
@@ -3049,8 +3057,12 @@ TEST_F(HistoryBackendTest, TopHosts_ElideWWW) {
urls.push_back(GURL("http://cnn.com/intl"));
urls.push_back(GURL("http://www.dogtopia.com/"));
for (const GURL& url : urls) {
- backend_->AddPageVisit(url, base::Time::Now(), 0, ui::PAGE_TRANSITION_LINK,
- history::SOURCE_BROWSED);
+ backend_->AddPageVisit(
+ url, base::Time::Now(), 0,
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
+ ui::PAGE_TRANSITION_CHAIN_START |
+ ui::PAGE_TRANSITION_CHAIN_END),
+ history::SOURCE_BROWSED);
}
EXPECT_THAT(backend_->TopHosts(3),
@@ -3064,12 +3076,20 @@ TEST_F(HistoryBackendTest, TopHosts_OnlyLast30Days) {
urls.push_back(GURL("http://cnn.com/intl"));
urls.push_back(GURL("http://dogtopia.com/"));
for (const GURL& url : urls) {
- backend_->AddPageVisit(url, base::Time::Now(), 0, ui::PAGE_TRANSITION_LINK,
- history::SOURCE_BROWSED);
+ backend_->AddPageVisit(
+ url, base::Time::Now(), 0,
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
+ ui::PAGE_TRANSITION_CHAIN_START |
+ ui::PAGE_TRANSITION_CHAIN_END),
+ history::SOURCE_BROWSED);
}
- backend_->AddPageVisit(GURL("http://www.oracle.com/"),
- base::Time::Now() - base::TimeDelta::FromDays(31), 0,
- ui::PAGE_TRANSITION_LINK, history::SOURCE_BROWSED);
+ backend_->AddPageVisit(
+ GURL("http://www.oracle.com/"),
+ base::Time::Now() - base::TimeDelta::FromDays(31), 0,
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
+ ui::PAGE_TRANSITION_CHAIN_START |
+ ui::PAGE_TRANSITION_CHAIN_END),
+ history::SOURCE_BROWSED);
EXPECT_THAT(backend_->TopHosts(3),
ElementsAre(std::make_pair("cnn.com", 2),
@@ -3085,8 +3105,12 @@ TEST_F(HistoryBackendTest, TopHosts_MaxNumHosts) {
urls.push_back(GURL("http://dogtopia.com/webcam"));
urls.push_back(GURL("http://www.gardenweb.com/"));
for (const GURL& url : urls) {
- backend_->AddPageVisit(url, base::Time::Now(), 0, ui::PAGE_TRANSITION_LINK,
- history::SOURCE_BROWSED);
+ backend_->AddPageVisit(
+ url, base::Time::Now(), 0,
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
+ ui::PAGE_TRANSITION_CHAIN_START |
+ ui::PAGE_TRANSITION_CHAIN_END),
+ history::SOURCE_BROWSED);
}
EXPECT_THAT(backend_->TopHosts(2),
@@ -3106,21 +3130,42 @@ TEST_F(HistoryBackendTest, TopHosts_IgnoreUnusualURLs) {
urls.push_back(GURL("chrome://version"));
urls.push_back(GURL("about:mammon"));
for (const GURL& url : urls) {
- backend_->AddPageVisit(url, base::Time::Now(), 0, ui::PAGE_TRANSITION_LINK,
- history::SOURCE_BROWSED);
+ backend_->AddPageVisit(
+ url, base::Time::Now(), 0,
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
+ ui::PAGE_TRANSITION_CHAIN_START |
+ ui::PAGE_TRANSITION_CHAIN_END),
+ history::SOURCE_BROWSED);
}
EXPECT_THAT(backend_->TopHosts(5), ElementsAre(std::make_pair("cnn.com", 3)));
}
+TEST_F(HistoryBackendTest, TopHosts_IgnoreRedirects) {
+ const char* redirect1[] = {"http://foo.com/page1.html",
+ "http://mobile.foo.com/page1.html", NULL};
+ const char* redirect2[] = {"http://bar.com/page1.html",
+ "https://bar.com/page1.html",
+ "https://mobile.bar.com/page1.html", NULL};
+ AddRedirectChain(redirect1, 0);
+ AddRedirectChain(redirect2, 1);
+ EXPECT_THAT(backend_->TopHosts(5),
+ ElementsAre(std::make_pair("mobile.bar.com", 1),
+ std::make_pair("mobile.foo.com", 1)));
+}
+
TEST_F(HistoryBackendTest, HostRankIfAvailable) {
std::vector<GURL> urls;
urls.push_back(GURL("http://cnn.com/us"));
urls.push_back(GURL("http://cnn.com/intl"));
urls.push_back(GURL("http://dogtopia.com/"));
for (const GURL& url : urls) {
- backend_->AddPageVisit(url, base::Time::Now(), 0, ui::PAGE_TRANSITION_LINK,
- history::SOURCE_BROWSED);
+ backend_->AddPageVisit(
+ url, base::Time::Now(), 0,
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
+ ui::PAGE_TRANSITION_CHAIN_START |
+ ui::PAGE_TRANSITION_CHAIN_END),
+ history::SOURCE_BROWSED);
}
EXPECT_EQ(kMaxTopHosts,
@@ -3143,8 +3188,12 @@ TEST_F(HistoryBackendTest, RecordTopHostsMetrics) {
urls.push_back(GURL("http://cnn.com/intl"));
urls.push_back(GURL("http://dogtopia.com/"));
for (const GURL& url : urls) {
- backend_->AddPageVisit(url, base::Time::Now(), 0, ui::PAGE_TRANSITION_LINK,
- history::SOURCE_BROWSED);
+ backend_->AddPageVisit(
+ url, base::Time::Now(), 0,
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
+ ui::PAGE_TRANSITION_CHAIN_START |
+ ui::PAGE_TRANSITION_CHAIN_END),
+ history::SOURCE_BROWSED);
}
// Compute host_ranks_ for RecordTopHostsMetrics.
« no previous file with comments | « no previous file | components/history/core/browser/history_database.cc » ('j') | components/history/core/browser/history_database.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698