OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/public/browser/host_zoom_map.h" | 5 #include "content/public/browser/host_zoom_map.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
13 #include "base/files/file_util.h" | 13 #include "base/files/file_util.h" |
14 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
16 #include "base/path_service.h" | 16 #include "base/path_service.h" |
17 #include "base/prefs/pref_service.h" | 17 #include "base/prefs/pref_service.h" |
18 #include "base/strings/stringprintf.h" | 18 #include "base/strings/stringprintf.h" |
19 #include "base/values.h" | 19 #include "base/values.h" |
20 #include "chrome/browser/chrome_page_zoom.h" | 20 #include "chrome/browser/chrome_page_zoom.h" |
21 #include "chrome/browser/profiles/profile.h" | 21 #include "chrome/browser/profiles/profile.h" |
22 #include "chrome/browser/ui/browser.h" | 22 #include "chrome/browser/ui/browser.h" |
23 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 23 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
24 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" | |
24 #include "chrome/common/chrome_constants.h" | 25 #include "chrome/common/chrome_constants.h" |
25 #include "chrome/common/chrome_paths.h" | 26 #include "chrome/common/chrome_paths.h" |
26 #include "chrome/common/pref_names.h" | 27 #include "chrome/common/pref_names.h" |
27 #include "chrome/test/base/in_process_browser_test.h" | 28 #include "chrome/test/base/in_process_browser_test.h" |
28 #include "chrome/test/base/testing_profile.h" | 29 #include "chrome/test/base/testing_profile.h" |
29 #include "chrome/test/base/ui_test_utils.h" | 30 #include "chrome/test/base/ui_test_utils.h" |
30 #include "content/public/test/test_utils.h" | 31 #include "content/public/test/test_utils.h" |
31 #include "net/dns/mock_host_resolver.h" | 32 #include "net/dns/mock_host_resolver.h" |
32 #include "net/test/embedded_test_server/embedded_test_server.h" | 33 #include "net/test/embedded_test_server/embedded_test_server.h" |
33 #include "net/test/embedded_test_server/http_response.h" | 34 #include "net/test/embedded_test_server/http_response.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
68 }; | 69 }; |
69 | 70 |
70 } // namespace | 71 } // namespace |
71 | 72 |
72 class HostZoomMapBrowserTest : public InProcessBrowserTest { | 73 class HostZoomMapBrowserTest : public InProcessBrowserTest { |
73 public: | 74 public: |
74 HostZoomMapBrowserTest() {} | 75 HostZoomMapBrowserTest() {} |
75 | 76 |
76 protected: | 77 protected: |
77 void SetDefaultZoomLevel(double level) { | 78 void SetDefaultZoomLevel(double level) { |
78 browser()->profile()->GetPrefs()->SetDouble( | 79 browser()->profile()->GetZoomLevelPrefs()->SetDefaultZoomLevel(level); |
Bernhard Bauer
2014/10/01 15:09:14
If you want to, you could pull these changes out i
| |
79 prefs::kDefaultZoomLevel, level); | |
80 } | 80 } |
81 | 81 |
82 double GetZoomLevel(const GURL& url) { | 82 double GetZoomLevel(const GURL& url) { |
83 content::HostZoomMap* host_zoom_map = static_cast<content::HostZoomMap*>( | 83 content::HostZoomMap* host_zoom_map = static_cast<content::HostZoomMap*>( |
84 content::HostZoomMap::GetDefaultForBrowserContext( | 84 content::HostZoomMap::GetDefaultForBrowserContext( |
85 browser()->profile())); | 85 browser()->profile())); |
86 return host_zoom_map->GetZoomLevelForHostAndScheme(url.scheme(), | 86 return host_zoom_map->GetZoomLevelForHostAndScheme(url.scheme(), |
87 url.host()); | 87 url.host()); |
88 } | 88 } |
89 | 89 |
90 std::vector<std::string> GetHostsWithZoomLevels() { | 90 std::vector<std::string> GetHostsWithZoomLevels() { |
91 typedef content::HostZoomMap::ZoomLevelVector ZoomLevelVector; | 91 typedef content::HostZoomMap::ZoomLevelVector ZoomLevelVector; |
92 content::HostZoomMap* host_zoom_map = static_cast<content::HostZoomMap*>( | 92 content::HostZoomMap* host_zoom_map = static_cast<content::HostZoomMap*>( |
93 content::HostZoomMap::GetDefaultForBrowserContext( | 93 content::HostZoomMap::GetDefaultForBrowserContext( |
94 browser()->profile())); | 94 browser()->profile())); |
95 content::HostZoomMap::ZoomLevelVector zoom_levels = | 95 content::HostZoomMap::ZoomLevelVector zoom_levels = |
96 host_zoom_map->GetAllZoomLevels(); | 96 host_zoom_map->GetAllZoomLevels(); |
97 std::vector<std::string> results; | 97 std::vector<std::string> results; |
98 for (ZoomLevelVector::const_iterator it = zoom_levels.begin(); | 98 for (ZoomLevelVector::const_iterator it = zoom_levels.begin(); |
99 it != zoom_levels.end(); ++it) | 99 it != zoom_levels.end(); ++it) |
100 results.push_back(it->host); | 100 results.push_back(it->host); |
101 return results; | 101 return results; |
102 } | 102 } |
103 | 103 |
104 std::vector<std::string> GetHostsWithZoomLevelsFromPrefs() { | 104 std::vector<std::string> GetHostsWithZoomLevelsFromPrefs() { |
105 PrefService* prefs = browser()->profile()->GetPrefs(); | 105 PrefService* prefs = browser()->profile()->GetPrefs(); |
106 const base::DictionaryValue* values = | 106 const base::DictionaryValue* dictionaries = |
107 prefs->GetDictionary(prefs::kPerHostZoomLevels); | 107 prefs->GetDictionary(prefs::kPerHostZoomLevels); |
108 const base::DictionaryValue* values = NULL; | |
109 dictionaries->GetDictionary("0", &values); | |
108 std::vector<std::string> results; | 110 std::vector<std::string> results; |
109 if (values) { | 111 if (values) { |
110 for (base::DictionaryValue::Iterator it(*values); | 112 for (base::DictionaryValue::Iterator it(*values); |
111 !it.IsAtEnd(); it.Advance()) | 113 !it.IsAtEnd(); it.Advance()) |
112 results.push_back(it.key()); | 114 results.push_back(it.key()); |
113 } | 115 } |
114 return results; | 116 return results; |
115 } | 117 } |
116 | 118 |
117 GURL ConstructTestServerURL(const char* url_template) { | 119 GURL ConstructTestServerURL(const char* url_template) { |
(...skipping 12 matching lines...) Expand all Loading... | |
130 virtual void SetUpOnMainThread() OVERRIDE { | 132 virtual void SetUpOnMainThread() OVERRIDE { |
131 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 133 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
132 embedded_test_server()->RegisterRequestHandler(base::Bind( | 134 embedded_test_server()->RegisterRequestHandler(base::Bind( |
133 &HostZoomMapBrowserTest::HandleRequest, base::Unretained(this))); | 135 &HostZoomMapBrowserTest::HandleRequest, base::Unretained(this))); |
134 host_resolver()->AddRule("*", "127.0.0.1"); | 136 host_resolver()->AddRule("*", "127.0.0.1"); |
135 } | 137 } |
136 | 138 |
137 DISALLOW_COPY_AND_ASSIGN(HostZoomMapBrowserTest); | 139 DISALLOW_COPY_AND_ASSIGN(HostZoomMapBrowserTest); |
138 }; | 140 }; |
139 | 141 |
140 class HostZoomMapSanitizationBrowserTest : public HostZoomMapBrowserTest { | 142 class HostZoomMapBrowserTestWithPrefs : public HostZoomMapBrowserTest { |
141 public: | 143 public: |
142 HostZoomMapSanitizationBrowserTest() {} | 144 HostZoomMapBrowserTestWithPrefs(const std::string& prefs_data, |
145 const std::string& prefs_filename) | |
146 : prefs_data_(prefs_data), prefs_filename_(prefs_filename) {} | |
143 | 147 |
144 private: | 148 private: |
145 // InProcessBrowserTest: | 149 // InProcessBrowserTest: |
146 virtual bool SetUpUserDataDirectory() OVERRIDE { | 150 virtual bool SetUpUserDataDirectory() OVERRIDE { |
147 // Zoom-related preferences demonstrating the two problems that could be | 151 std::replace(prefs_data_.begin(), prefs_data_.end(), '\'', '\"'); |
148 // caused by the bug. They incorrectly contain a per-host zoom level for the | |
149 // empty host; and a value for 'host1' that only differs from the default by | |
150 // epsilon. Neither should have been persisted. | |
151 const char kBrokenPrefs[] = | |
152 "{'profile': {" | |
153 " 'default_zoom_level': 1.2," | |
154 " 'per_host_zoom_levels': {'': 1.1, 'host1': 1.20001, 'host2': 1.3}" | |
155 "}}"; | |
156 std::string broken_prefs(kBrokenPrefs); | |
157 std::replace(broken_prefs.begin(), broken_prefs.end(), '\'', '\"'); | |
158 | 152 |
159 base::FilePath user_data_directory, path_to_prefs; | 153 base::FilePath user_data_directory, path_to_prefs; |
160 PathService::Get(chrome::DIR_USER_DATA, &user_data_directory); | 154 PathService::Get(chrome::DIR_USER_DATA, &user_data_directory); |
161 path_to_prefs = user_data_directory | 155 path_to_prefs = user_data_directory |
162 .AppendASCII(TestingProfile::kTestUserProfileDir) | 156 .AppendASCII(TestingProfile::kTestUserProfileDir) |
163 .Append(chrome::kPreferencesFilename); | 157 .Append(prefs_filename_); |
164 base::CreateDirectory(path_to_prefs.DirName()); | 158 base::CreateDirectory(path_to_prefs.DirName()); |
165 base::WriteFile(path_to_prefs, broken_prefs.c_str(), broken_prefs.size()); | 159 base::WriteFile( |
160 path_to_prefs, prefs_data_.c_str(), prefs_data_.size()); | |
166 return true; | 161 return true; |
167 } | 162 } |
168 | 163 |
164 std::string prefs_data_; | |
165 std::string prefs_filename_; | |
166 | |
167 DISALLOW_COPY_AND_ASSIGN(HostZoomMapBrowserTestWithPrefs); | |
168 }; | |
169 | |
170 class HostZoomMapSanitizationBrowserTest | |
171 : public HostZoomMapBrowserTestWithPrefs { | |
172 public: | |
173 HostZoomMapSanitizationBrowserTest() | |
174 : HostZoomMapBrowserTestWithPrefs( | |
175 // Zoom-related preferences demonstrating the two problems that | |
176 // could be caused by the bug. They incorrectly contain a per-host | |
177 // zoom level for the empty host; and a value for 'host1' that only | |
178 // differs from the default by epsilon. Neither should have been | |
179 // persisted. | |
180 "{'partition': {" | |
Bernhard Bauer
2014/10/01 15:09:14
Could you put this together with the comment into
wjmaclean
2014/10/01 20:32:59
Done.
| |
181 " 'default_zoom_level': { '0': 1.2 }," | |
182 " 'per_host_zoom_levels': {" | |
183 " '0': { '': 1.1, 'host1': 1.20001, 'host2': 1.3 }" | |
184 " }" | |
185 "}}", | |
186 chrome::kPreferencesFilename) {} | |
187 | |
188 private: | |
169 DISALLOW_COPY_AND_ASSIGN(HostZoomMapSanitizationBrowserTest); | 189 DISALLOW_COPY_AND_ASSIGN(HostZoomMapSanitizationBrowserTest); |
170 }; | 190 }; |
171 | 191 |
172 // Regression test for crbug.com/364399. | 192 // Regression test for crbug.com/364399. |
173 IN_PROC_BROWSER_TEST_F(HostZoomMapBrowserTest, ToggleDefaultZoomLevel) { | 193 IN_PROC_BROWSER_TEST_F(HostZoomMapBrowserTest, ToggleDefaultZoomLevel) { |
174 const double default_zoom_level = content::ZoomFactorToZoomLevel(1.5); | 194 const double default_zoom_level = content::ZoomFactorToZoomLevel(1.5); |
175 | 195 |
176 const char kTestURLTemplate1[] = "http://host1:%d/"; | 196 const char kTestURLTemplate1[] = "http://host1:%d/"; |
177 const char kTestURLTemplate2[] = "http://host2:%d/"; | 197 const char kTestURLTemplate2[] = "http://host2:%d/"; |
178 | 198 |
(...skipping 30 matching lines...) Expand all Loading... | |
209 // any per-host values saved either to Pref, or internally in HostZoomMap. | 229 // any per-host values saved either to Pref, or internally in HostZoomMap. |
210 EXPECT_TRUE(GetHostsWithZoomLevels().empty()); | 230 EXPECT_TRUE(GetHostsWithZoomLevels().empty()); |
211 EXPECT_TRUE(GetHostsWithZoomLevelsFromPrefs().empty()); | 231 EXPECT_TRUE(GetHostsWithZoomLevelsFromPrefs().empty()); |
212 } | 232 } |
213 | 233 |
214 // Test that garbage data from crbug.com/364399 is cleared up on startup. | 234 // Test that garbage data from crbug.com/364399 is cleared up on startup. |
215 IN_PROC_BROWSER_TEST_F(HostZoomMapSanitizationBrowserTest, ClearOnStartup) { | 235 IN_PROC_BROWSER_TEST_F(HostZoomMapSanitizationBrowserTest, ClearOnStartup) { |
216 EXPECT_THAT(GetHostsWithZoomLevels(), testing::ElementsAre("host2")); | 236 EXPECT_THAT(GetHostsWithZoomLevels(), testing::ElementsAre("host2")); |
217 EXPECT_THAT(GetHostsWithZoomLevelsFromPrefs(), testing::ElementsAre("host2")); | 237 EXPECT_THAT(GetHostsWithZoomLevelsFromPrefs(), testing::ElementsAre("host2")); |
218 } | 238 } |
239 | |
240 class HostZoomMapMigrationBrowserTest : public HostZoomMapBrowserTestWithPrefs { | |
241 public: | |
242 HostZoomMapMigrationBrowserTest() | |
243 : // In this case we migrate the zoom level data from the profile prefs. | |
244 HostZoomMapBrowserTestWithPrefs( | |
245 "{'profile': {" | |
246 " 'default_zoom_level': 1.2," | |
247 " 'per_host_zoom_levels': {'': 1.1, 'host1': 1.20001, 'host2': " | |
248 "1.3}" | |
249 "}}", | |
250 chrome::kPreferencesFilename) {} | |
251 | |
252 static const double kOriginalDefaultZoomLevel; | |
253 | |
254 private: | |
255 DISALLOW_COPY_AND_ASSIGN(HostZoomMapMigrationBrowserTest); | |
256 }; | |
257 | |
258 const double HostZoomMapMigrationBrowserTest::kOriginalDefaultZoomLevel = 1.2; | |
259 | |
260 // This test is the same as HostZoomMapSanitizationBrowserTest, except that the | |
261 // zoom level data is loaded from the profile prefs, transfered to the | |
262 // zoom-level prefs, and we verify that the profile zoom level prefs are | |
263 // erased in the process. We also test that changes to the host zoom map and the | |
264 // default zoom level don't propagate back to the profile prefs. | |
265 IN_PROC_BROWSER_TEST_F(HostZoomMapMigrationBrowserTest, | |
266 MigrateProfileZoomPreferences) { | |
267 EXPECT_THAT(GetHostsWithZoomLevels(), testing::ElementsAre("host2")); | |
268 EXPECT_THAT(GetHostsWithZoomLevelsFromPrefs(), testing::ElementsAre("host2")); | |
269 | |
270 PrefService* profile_prefs = | |
271 browser()->profile()->GetPrefs(); | |
272 chrome::ChromeZoomLevelPrefs* zoom_level_prefs = | |
273 browser()->profile()->GetZoomLevelPrefs(); | |
274 // Make sure that the profile pref for default zoom level has been set to | |
275 // its default value of 0.0. | |
276 EXPECT_EQ(0.0, profile_prefs->GetDouble(prefs::kProfileDefaultZoomLevel)); | |
277 EXPECT_EQ(kOriginalDefaultZoomLevel, | |
278 profile_prefs->GetDouble( | |
279 zoom_level_prefs->GetDefaultZoomLevelPath().c_str())); | |
280 | |
281 // Make sure that the profile prefs for per-host zoom levels are erased. | |
282 { | |
283 const base::DictionaryValue* profile_host_zoom_dictionary = | |
284 profile_prefs->GetDictionary(prefs::kProfilePerHostZoomLevels); | |
285 EXPECT_EQ(0UL, profile_host_zoom_dictionary->size()); | |
286 } | |
287 | |
288 ZoomLevelChangeObserver observer(browser()->profile()); | |
289 content::HostZoomMap* host_zoom_map = static_cast<content::HostZoomMap*>( | |
290 content::HostZoomMap::GetDefaultForBrowserContext( | |
291 browser()->profile())); | |
292 | |
293 // Make sure that a change to a host zoom level doesn't propagate to the | |
294 // profile prefs. | |
295 std::string host3("host3"); | |
296 host_zoom_map->SetZoomLevelForHost(host3, 1.3); | |
297 observer.BlockUntilZoomLevelForHostHasChanged(host3); | |
298 EXPECT_THAT(GetHostsWithZoomLevelsFromPrefs(), | |
299 testing::ElementsAre("host2", host3)); | |
300 { | |
301 const base::DictionaryValue* profile_host_zoom_dictionary = | |
302 profile_prefs->GetDictionary(prefs::kProfilePerHostZoomLevels); | |
303 EXPECT_EQ(0UL, profile_host_zoom_dictionary->size()); | |
304 } | |
305 | |
306 // Make sure a change to the default zoom level doesn't propagate to the | |
307 // profile prefs. | |
308 | |
309 // First, we need a host at the default zoom level to respond when the | |
310 // default zoom level changes. | |
311 const double kNewDefaultZoomLevel = 1.5; | |
312 GURL test_url = ConstructTestServerURL("http://host4:%d/"); | |
313 ui_test_utils::NavigateToURL(browser(), test_url); | |
314 EXPECT_TRUE(content::ZoomValuesEqual(kOriginalDefaultZoomLevel, | |
315 GetZoomLevel(test_url))); | |
316 | |
317 // Change the default zoom level and observe. | |
318 zoom_level_prefs->SetDefaultZoomLevel(kNewDefaultZoomLevel); | |
319 observer.BlockUntilZoomLevelForHostHasChanged(test_url.host()); | |
320 EXPECT_TRUE( | |
321 content::ZoomValuesEqual(kNewDefaultZoomLevel, GetZoomLevel(test_url))); | |
322 EXPECT_EQ(kNewDefaultZoomLevel, | |
323 profile_prefs->GetDouble( | |
324 zoom_level_prefs->GetDefaultZoomLevelPath().c_str())); | |
325 EXPECT_EQ(0.0, profile_prefs->GetDouble(prefs::kProfileDefaultZoomLevel)); | |
326 } | |
327 | |
OLD | NEW |