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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 335233003: Convert ui::ScaleFactor -> float in favicon/history code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
« chrome/browser/favicon/favicon_handler.cc ('K') | « chrome/browser/history/history_backend.cc ('k') | chrome/browser/history/history_service.h » ('j') | components/favicon_base/favicon_util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/history_backend_unittest.cc
diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc
index e005c201f36b9b2c5ecae2e8805ab7c08197ce6a..94f72bbe0b84a4da1b0bfad07dae0a850beb2b48 100644
--- a/chrome/browser/history/history_backend_unittest.cc
+++ b/chrome/browser/history/history_backend_unittest.cc
@@ -326,12 +326,12 @@ class HistoryBackendTest : public HistoryBackendTestBase {
return sizes_tiny_small_and_large;
}
- // Returns 1x and 2x scale factors.
- const std::vector<ui::ScaleFactor> GetScaleFactors1x2x() {
- std::vector<ui::ScaleFactor> scale_factors_1x_2x;
- scale_factors_1x_2x.push_back(ui::SCALE_FACTOR_100P);
- scale_factors_1x_2x.push_back(ui::SCALE_FACTOR_200P);
- return scale_factors_1x_2x;
+ // Returns 1x and 2x favicons cales.
+ const std::vector<float> GetFaviconScales1x2x() {
+ std::vector<float> scales_1x_2x;
+ scales_1x_2x.push_back(1.0f);
+ scales_1x_2x.push_back(2.0f);
+ return scales_1x_2x;
}
// Returns the number of icon mappings of |icon_type| to |page_url|.
@@ -1784,7 +1784,7 @@ TEST_F(HistoryBackendTest, SetFaviconsSameFaviconURLForTwoPages) {
icon_urls,
favicon_base::FAVICON,
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results);
// Check that the same FaviconID is mapped to both page URLs.
@@ -1862,7 +1862,7 @@ TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchNoChange) {
icon_urls,
favicon_base::FAVICON,
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results);
EXPECT_EQ(icon_id,
@@ -2199,7 +2199,7 @@ TEST_F(HistoryBackendTest, MergeFaviconShowsUpInGetFaviconsForURLResult) {
backend_->GetFaviconsForURL(page_url,
favicon_base::FAVICON,
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results);
EXPECT_EQ(2u, bitmap_results.size());
@@ -2354,7 +2354,7 @@ TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchMultipleIconTypes) {
icon_urls,
(favicon_base::TOUCH_ICON | favicon_base::TOUCH_PRECOMPOSED_ICON),
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results);
// |page_url1| and |page_url2| should still be mapped to the same icon URLs.
@@ -2393,7 +2393,7 @@ TEST_F(HistoryBackendTest, GetFaviconsFromDBEmpty) {
EXPECT_FALSE(backend_->GetFaviconsFromDB(page_url,
favicon_base::FAVICON,
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results));
EXPECT_TRUE(bitmap_results.empty());
}
@@ -2413,7 +2413,7 @@ TEST_F(HistoryBackendTest, GetFaviconsFromDBNoFaviconBitmaps) {
EXPECT_FALSE(backend_->GetFaviconsFromDB(page_url,
favicon_base::FAVICON,
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results_out));
EXPECT_TRUE(bitmap_results_out.empty());
}
@@ -2434,7 +2434,7 @@ TEST_F(HistoryBackendTest, GetFaviconsFromDBSelectClosestMatch) {
EXPECT_TRUE(backend_->GetFaviconsFromDB(page_url,
favicon_base::FAVICON,
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results_out));
// The bitmap data for the small and large bitmaps should be returned as their
@@ -2478,7 +2478,7 @@ TEST_F(HistoryBackendTest, GetFaviconsFromDBSingleIconURL) {
EXPECT_TRUE(backend_->GetFaviconsFromDB(page_url,
favicon_base::FAVICON,
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results_out));
// The results should have results for the icon URL with the large bitmap as
@@ -2507,7 +2507,7 @@ TEST_F(HistoryBackendTest, GetFaviconsFromDBIconType) {
EXPECT_TRUE(backend_->GetFaviconsFromDB(page_url,
favicon_base::FAVICON,
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results_out));
EXPECT_EQ(1u, bitmap_results_out.size());
@@ -2518,7 +2518,7 @@ TEST_F(HistoryBackendTest, GetFaviconsFromDBIconType) {
EXPECT_TRUE(backend_->GetFaviconsFromDB(page_url,
favicon_base::TOUCH_ICON,
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results_out));
EXPECT_EQ(1u, bitmap_results_out.size());
@@ -2546,7 +2546,7 @@ TEST_F(HistoryBackendTest, GetFaviconsFromDBExpired) {
EXPECT_TRUE(backend_->GetFaviconsFromDB(page_url,
favicon_base::FAVICON,
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results_out));
EXPECT_EQ(1u, bitmap_results_out.size());
@@ -2565,7 +2565,7 @@ TEST_F(HistoryBackendTest, UpdateFaviconMappingsAndFetchNoDB) {
std::vector<GURL>(),
favicon_base::FAVICON,
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results);
EXPECT_TRUE(bitmap_results.empty());
@@ -2589,17 +2589,17 @@ TEST_F(HistoryBackendTest, CloneFaviconIsRestrictedToSameDomain) {
EXPECT_TRUE(backend_->GetFaviconsFromDB(url,
favicon_base::FAVICON,
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results_out));
EXPECT_FALSE(backend_->GetFaviconsFromDB(same_domain_url,
favicon_base::FAVICON,
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results_out));
EXPECT_FALSE(backend_->GetFaviconsFromDB(foreign_domain_url,
favicon_base::FAVICON,
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results_out));
// Same-domain cloning should work.
@@ -2607,7 +2607,7 @@ TEST_F(HistoryBackendTest, CloneFaviconIsRestrictedToSameDomain) {
EXPECT_TRUE(backend_->GetFaviconsFromDB(same_domain_url,
favicon_base::FAVICON,
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results_out));
// Foreign-domain cloning is forbidden.
@@ -2615,7 +2615,7 @@ TEST_F(HistoryBackendTest, CloneFaviconIsRestrictedToSameDomain) {
EXPECT_FALSE(backend_->GetFaviconsFromDB(foreign_domain_url,
favicon_base::FAVICON,
kSmallSize.width(),
- GetScaleFactors1x2x(),
+ GetFaviconScales1x2x(),
&bitmap_results_out));
}
« chrome/browser/favicon/favicon_handler.cc ('K') | « chrome/browser/history/history_backend.cc ('k') | chrome/browser/history/history_service.h » ('j') | components/favicon_base/favicon_util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698