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

Side by Side Diff: chrome/browser/ui/webui/favicon_source_unittest.cc

Issue 15388002: Supporting high dpi favicons in Instant Extended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and rebase Created 7 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
(Empty)
1 // Copyright (c) 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/ui/webui/favicon_source.h"
6
7 #include "base/message_loop.h"
8 #include "base/strings/string_number_conversions.h"
9 #include "chrome/browser/search/instant_service.h"
10 #include "chrome/browser/search/instant_service_factory.h"
11 #include "chrome/test/base/testing_profile.h"
12 #include "content/public/test/test_browser_thread.h"
13 #include "testing/gtest/include/gtest/gtest.h"
14 #include "ui/base/layout.h"
15
16 class FaviconSourceTest : public testing::Test {
17 public:
18 FaviconSourceTest()
19 : loop_(base::MessageLoop::TYPE_UI),
20 ui_thread_(content::BrowserThread::UI, base::MessageLoop::current()),
21 io_thread_(content::BrowserThread::IO, base::MessageLoop::current()),
22 profile_(new TestingProfile()),
23 favicon_source_(
24 new FaviconSource(profile_.get(), FaviconSource::ANY)) {
25
26 // Set the supported scale factors because the supported scale factors
27 // affect the result of ParsePathAndScale().
28 std::vector<ui::ScaleFactor> supported_scale_factors;
29 supported_scale_factors.push_back(ui::SCALE_FACTOR_100P);
30 supported_scale_factors.push_back(ui::SCALE_FACTOR_140P);
31 scoped_set_supported_scale_factors_.reset(
32 new ui::test::ScopedSetSupportedScaleFactors(supported_scale_factors));
33 }
34
35 virtual ~FaviconSourceTest() {
36 }
37
38 FaviconSource* favicon_source() const { return favicon_source_.get(); }
39
40 private:
41 base::MessageLoop loop_;
42 content::TestBrowserThread ui_thread_;
43 content::TestBrowserThread io_thread_;
44 scoped_ptr<TestingProfile> profile_;
45
46 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
47 ScopedSetSupportedScaleFactors;
48 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
49
50 scoped_ptr<FaviconSource> favicon_source_;
51
52 DISALLOW_COPY_AND_ASSIGN(FaviconSourceTest);
53 };
54
55 // Test parsing the chrome-search://favicon/ URLs
56 TEST_F(FaviconSourceTest, InstantParsing) {
57 const std::string path("chrome-search://favicon/http://www.google.com");
58 bool is_icon_url;
59 GURL url;
60 int size_in_dip;
61 ui::ScaleFactor scale_factor;
62
63 EXPECT_TRUE(favicon_source()->ParsePath(path, &is_icon_url, &url,
64 &size_in_dip, &scale_factor));
65 EXPECT_FALSE(is_icon_url);
66 EXPECT_EQ(GURL(path), url);
67 EXPECT_EQ(16, size_in_dip);
68 EXPECT_EQ(ui::SCALE_FACTOR_100P, scale_factor);
69 }
70
71 // Test parsing the chrome://favicon URLs
72 TEST_F(FaviconSourceTest, Parsing) {
73 const GURL kUrl("https://www.google.ca/imghp?hl=en&tab=wi");
74
75 bool is_icon_url;
76 GURL url;
77 int size_in_dip;
78 ui::ScaleFactor scale_factor;
79
80 // 1) Test parsing path with no extra parameters.
81 const std::string path1 = kUrl.spec();
82 EXPECT_TRUE(favicon_source()->ParsePath(path1, &is_icon_url, &url,
83 &size_in_dip, &scale_factor));
84 EXPECT_FALSE(is_icon_url);
85 EXPECT_EQ(kUrl, url);
86 EXPECT_EQ(16, size_in_dip);
87 EXPECT_EQ(ui::SCALE_FACTOR_100P, scale_factor);
88
89 // 2) Test parsing path with a 'size' parameter.
90 //
91 // Test that we can still parse the legacy 'size' parameter format.
92 const std::string path2 = "size/32/" + kUrl.spec();
93 EXPECT_TRUE(favicon_source()->ParsePath(path2, &is_icon_url, &url,
94 &size_in_dip, &scale_factor));
95 EXPECT_FALSE(is_icon_url);
96 EXPECT_EQ(kUrl, url);
97 EXPECT_EQ(32, size_in_dip);
98 EXPECT_EQ(ui::SCALE_FACTOR_100P, scale_factor);
99
100 // Test parsing current 'size' parameter format.
101 const std::string path3 = "size/32@1.4x/" + kUrl.spec();
102 EXPECT_TRUE(favicon_source()->ParsePath(path3, &is_icon_url, &url,
103 &size_in_dip, &scale_factor));
104 EXPECT_FALSE(is_icon_url);
105 EXPECT_EQ(kUrl, url);
106 EXPECT_EQ(32, size_in_dip);
107 EXPECT_EQ(ui::SCALE_FACTOR_140P, scale_factor);
108
109 // Test that we pick the ui::ScaleFactor which is closest to the passed in
110 // scale factor.
111 const std::string path4 = "size/16@1.41x/" + kUrl.spec();
112 EXPECT_TRUE(favicon_source()->ParsePath(path4, &is_icon_url, &url,
113 &size_in_dip, &scale_factor));
114 EXPECT_FALSE(is_icon_url);
115 EXPECT_EQ(kUrl, url);
116 EXPECT_EQ(16, size_in_dip);
117 EXPECT_EQ(ui::SCALE_FACTOR_140P, scale_factor);
118
119 // Invalid cases.
120 const std::string path5 = "size/" + kUrl.spec();
121 EXPECT_FALSE(favicon_source()->ParsePath(path5, &is_icon_url, &url,
122 &size_in_dip, &scale_factor));
123 const std::string path6 = "size/@1x/" + kUrl.spec();
124 EXPECT_FALSE(favicon_source()->ParsePath(path6, &is_icon_url, &url,
125 &size_in_dip, &scale_factor));
126 const std::string path7 = "size/abc@1x/" + kUrl.spec();
127 EXPECT_FALSE(favicon_source()->ParsePath(path7, &is_icon_url, &url,
128 &size_in_dip, &scale_factor));
129
130 // Part of url looks like 'size' parameter.
131 const std::string path8 = "http://www.google.com/size/32@1.4x";
132 EXPECT_TRUE(favicon_source()->ParsePath(path8, &is_icon_url, &url,
133 &size_in_dip, &scale_factor));
134 EXPECT_FALSE(is_icon_url);
135 EXPECT_EQ(path8, url.spec());
136 EXPECT_EQ(16, size_in_dip);
137 EXPECT_EQ(ui::SCALE_FACTOR_100P, scale_factor);
138
139 // 3) Test parsing path with the 'largest' parameter.
140 const std::string path9 = "largest/" + kUrl.spec();
141 EXPECT_TRUE(favicon_source()->ParsePath(path9, &is_icon_url, &url,
142 &size_in_dip, &scale_factor));
143 EXPECT_FALSE(is_icon_url);
144 EXPECT_EQ(kUrl, url);
145 EXPECT_EQ(0, size_in_dip);
146 // The scale factor is meaningless when requesting the largest favicon.
147
148 // 4) Test parsing path with 'iconurl' parameter.
149 const std::string path10 = "iconurl/http://www.google.com/favicon.ico";
150 EXPECT_TRUE(favicon_source()->ParsePath(path10, &is_icon_url, &url,
151 &size_in_dip, &scale_factor));
152 EXPECT_TRUE(is_icon_url);
153 EXPECT_EQ("http://www.google.com/favicon.ico", url.spec());
154 EXPECT_EQ(16, size_in_dip);
155 EXPECT_EQ(ui::SCALE_FACTOR_100P, scale_factor);
156
157 // 5) Test parsing path with 'origin' parameter.
158 const std::string path11 = "origin/" + kUrl.spec();
159 EXPECT_TRUE(favicon_source()->ParsePath(path11, &is_icon_url, &url,
160 &size_in_dip, &scale_factor));
161 EXPECT_FALSE(is_icon_url);
162 EXPECT_EQ("https://www.google.ca/", url.spec());
163 EXPECT_EQ(16, size_in_dip);
164 EXPECT_EQ(ui::SCALE_FACTOR_100P, scale_factor);
165
166 const std::string path12 = "origin/google.com";
167 EXPECT_TRUE(favicon_source()->ParsePath(path12, &is_icon_url, &url,
168 &size_in_dip, &scale_factor));
169 EXPECT_FALSE(is_icon_url);
170 EXPECT_EQ("http://google.com/", url.spec());
171 EXPECT_EQ(16, size_in_dip);
172 EXPECT_EQ(ui::SCALE_FACTOR_100P, scale_factor);
173
174 // 6) Test parsing paths with both a 'size' parameter and a 'url modifier'
175 // parameter.
176 const std::string path13 = "size/32@1.4x/origin/" + kUrl.spec();
177 EXPECT_TRUE(favicon_source()->ParsePath(path13, &is_icon_url, &url,
178 &size_in_dip, &scale_factor));
179 EXPECT_FALSE(is_icon_url);
180 EXPECT_EQ("https://www.google.ca/", url.spec());
181 EXPECT_EQ(32, size_in_dip);
182 EXPECT_EQ(ui::SCALE_FACTOR_140P, scale_factor);
183
184 const std::string path14 =
185 "largest/iconurl/http://www.google.com/favicon.ico";
186 EXPECT_TRUE(favicon_source()->ParsePath(path14, &is_icon_url, &url,
187 &size_in_dip, &scale_factor));
188 EXPECT_TRUE(is_icon_url);
189 EXPECT_EQ("http://www.google.com/favicon.ico", url.spec());
190 EXPECT_EQ(0, size_in_dip);
191 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/favicon_source.cc ('k') | chrome/browser/ui/webui/ntp/app_launcher_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698