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

Side by Side Diff: chrome/browser/favicon/favicon_downloader_unittest.cc

Issue 64853004: Use high resolution icons where possible for streamlined hosted app icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@browser_experiment_create_app_from_page
Patch Set: mass refactor: pull code into FaviconDownloader class Created 7 years 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 unified diff | Download patch
OLDNEW
(Empty)
1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "chrome/browser/favicon/favicon_downloader.h"
6
7 #include "base/files/scoped_temp_dir.h"
8 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
9 #include "content/public/common/favicon_url.h"
10 #include "testing/gtest/include/gtest/gtest.h"
11 #include "third_party/skia/include/core/SkBitmap.h"
12
13 using content::RenderViewHostTester;
14
15 namespace {
16
17 // Creates valid SkBitmaps of the dimensions found in |sizes| and pushes them
18 // into |bitmaps|.
19 std::vector<SkBitmap> CreateTestBitmaps(const std::vector<gfx::Size>& sizes) {
20 std::vector<SkBitmap> bitmaps(sizes.size());
21 for (size_t i = 0; i < sizes.size(); ++i) {
22 SkBitmap& bitmap = bitmaps[i];
23 bitmap.setConfig(SkBitmap::kARGB_8888_Config,
24 sizes[i].width(),
25 sizes[i].height());
26 bitmap.allocPixels();
27 bitmap.eraseColor(SK_ColorRED);
28 }
29 return bitmaps;
30 }
31
32 class FaviconDownloaderTest : public ChromeRenderViewHostTestHarness {
33 protected:
34 FaviconDownloaderTest() {
35 }
36
37 virtual ~FaviconDownloaderTest() {
38 }
39
40 private:
41 DISALLOW_COPY_AND_ASSIGN(FaviconDownloaderTest);
42 };
43
44 } // namespace
45
46 class TestFaviconDownloader : public FaviconDownloader {
47 public:
48 explicit TestFaviconDownloader(content::WebContents* web_contents)
49 : FaviconDownloader(
50 web_contents,
51 base::Bind(&TestFaviconDownloader::DownloadsComplete,
52 base::Unretained(this))),
53 id_counter_(0) {
54 }
55 virtual ~TestFaviconDownloader() {}
56
57 virtual int DownloadImage(const GURL& url) OVERRIDE {
58 return id_counter_++;
59 }
60
61 virtual void PopulateFaviconURLsFromWebContents() {
62 if (!initial_favicon_urls_.empty())
63 favicon_url_candidates_ = &initial_favicon_urls_;
64 }
65
66 size_t pending_requests() const {
67 return in_progress_requests_.size();
68 }
69
70 void DownloadsComplete(bool success,
71 const FaviconDownloader::FaviconMap& map) {
72 favicon_map_ = map;
73 }
74
75 FaviconDownloader::FaviconMap favicon_map() const {
76 return favicon_map_;
77 }
78
79 void CompleteImageDownload(
80 int id,
81 const GURL& image_url,
82 const std::vector<gfx::Size>& original_bitmap_sizes) {
83 FaviconDownloader::DidDownloadFavicon(id, 200, image_url,
84 CreateTestBitmaps(original_bitmap_sizes), original_bitmap_sizes);
85 }
86
87 void UpdateFaviconURLs(const std::vector<content::FaviconURL>& candidates) {
88 FaviconDownloader::DidUpdateFaviconURL(0, candidates);
89 }
90
91 void set_initial_favicon_urls(const std::vector<content::FaviconURL>& urls) {
92 initial_favicon_urls_ = urls;
93 }
94
95 private:
96 std::vector<content::FaviconURL> initial_favicon_urls_;
97 FaviconDownloader::FaviconMap favicon_map_;
98 int id_counter_;
99 DISALLOW_COPY_AND_ASSIGN(TestFaviconDownloader);
100 };
101
102 TEST_F(FaviconDownloaderTest, SimpleDownload) {
103 const GURL favicon_url("http://www.google.com/favicon.ico");
104 TestFaviconDownloader downloader(web_contents());
105
106 std::vector<content::FaviconURL> favicon_urls;
107 favicon_urls.push_back(
108 content::FaviconURL(favicon_url,
109 content::FaviconURL::FAVICON));
110 downloader.set_initial_favicon_urls(favicon_urls);
111 EXPECT_EQ(0, downloader.pending_requests());
112
113 downloader.Start();
114 EXPECT_EQ(1, downloader.pending_requests());
115
116 std::vector<gfx::Size> sizes(1, gfx::Size(32, 32));
117 downloader.CompleteImageDownload(0, favicon_urls[0].icon_url, sizes);
118 EXPECT_EQ(0, downloader.pending_requests());
119
120 EXPECT_EQ(1, downloader.favicon_map().size());
121 EXPECT_EQ(1, downloader.favicon_map()[favicon_url].size());
122 }
123
124 TEST_F(FaviconDownloaderTest, DownloadWithUrlsFromWebContentsNotification) {
125 const GURL favicon_url("http://www.google.com/favicon.ico");
126 TestFaviconDownloader downloader(web_contents());
127
128 std::vector<content::FaviconURL> favicon_urls;
129 favicon_urls.push_back(
130 content::FaviconURL(favicon_url,
131 content::FaviconURL::FAVICON));
132 EXPECT_EQ(0, downloader.pending_requests());
133
134 // Start downloader before favicon URLs are loaded.
135 downloader.Start();
136 EXPECT_EQ(0, downloader.pending_requests());
137
138 downloader.UpdateFaviconURLs(favicon_urls);
139 EXPECT_EQ(1, downloader.pending_requests());
140
141 std::vector<gfx::Size> sizes(1, gfx::Size(32, 32));
142 downloader.CompleteImageDownload(0, favicon_urls[0].icon_url, sizes);
143 EXPECT_EQ(0, downloader.pending_requests());
144
145 EXPECT_EQ(1, downloader.favicon_map().size());
146 EXPECT_EQ(1, downloader.favicon_map()[favicon_url].size());
147 }
148
149 TEST_F(FaviconDownloaderTest, DownloadMultipleUrls) {
150 TestFaviconDownloader downloader(web_contents());
151 const GURL empty_favicon("http://www.google.com/empty_favicon.ico");
152 const GURL favicon_url_1("http://www.google.com/favicon.ico");
153 const GURL favicon_url_2("http://www.google.com/favicon2.ico");
154
155 // This should get downloaded.
156 downloader.AddExtraFaviconUrl(favicon_url_2);
157
158 // This is duplicated in the favicon urls and should only be downloaded once.
159 downloader.AddExtraFaviconUrl(empty_favicon);
160
161 std::vector<content::FaviconURL> favicon_urls;
162 favicon_urls.push_back(
163 content::FaviconURL(favicon_url_1,
164 content::FaviconURL::FAVICON));
165 // This is duplicated in the favicon urls and should only be downloaded once.
166 favicon_urls.push_back(
167 content::FaviconURL(empty_favicon,
168 content::FaviconURL::FAVICON));
169 // Invalid icons shouldn't get put into the download queue.
170 favicon_urls.push_back(
171 content::FaviconURL(GURL("http://www.google.com/invalid.ico"),
172 content::FaviconURL::INVALID_ICON));
173 downloader.set_initial_favicon_urls(favicon_urls);
174 downloader.Start();
175 EXPECT_EQ(3, downloader.pending_requests());
176
177 std::vector<gfx::Size> sizes_1(1, gfx::Size(16, 16));
178 downloader.CompleteImageDownload(0, favicon_url_1, sizes_1);
179
180 std::vector<gfx::Size> sizes_2;
181 sizes_2.push_back(gfx::Size(32, 32));
182 sizes_2.push_back(gfx::Size(64, 64));
183 downloader.CompleteImageDownload(1, favicon_url_2, sizes_2);
184
185 // Only 1 download should have been initiated for |empty_favicon| even though
186 // the URL was in both the web app info and the favicon urls.
187 downloader.CompleteImageDownload(2, empty_favicon, std::vector<gfx::Size>());
188 EXPECT_EQ(0, downloader.pending_requests());
189
190 EXPECT_EQ(3, downloader.favicon_map().size());
191 EXPECT_EQ(0, downloader.favicon_map()[empty_favicon].size());
192 EXPECT_EQ(1, downloader.favicon_map()[favicon_url_1].size());
193 EXPECT_EQ(2, downloader.favicon_map()[favicon_url_2].size());
194 }
195
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698