diff --git a/components/net/hsts.rs b/components/net/hsts.rs index 336b66bf0a7..1d56473ef85 100644 --- a/components/net/hsts.rs +++ b/components/net/hsts.rs @@ -63,7 +63,8 @@ impl HSTSList { } } - pub fn new_from_preload(preload_content: &str) -> Option { + /// Create an `HSTSList` from the contents of a JSON preload file. + pub fn from_preload(preload_content: &str) -> Option { decode(preload_content).ok() } @@ -114,7 +115,7 @@ impl HSTSList { pub fn preload_hsts_domains() -> Option { read_resource_file("hsts_preload.json").ok().and_then(|bytes| { from_utf8(&bytes).ok().and_then(|hsts_preload_content| { - HSTSList::new_from_preload(hsts_preload_content) + HSTSList::from_preload(hsts_preload_content) }) }) } diff --git a/tests/unit/net/hsts.rs b/tests/unit/net/hsts.rs index 898f31b06b0..3691c9dc486 100644 --- a/tests/unit/net/hsts.rs +++ b/tests/unit/net/hsts.rs @@ -151,13 +151,13 @@ fn test_push_entry_to_hsts_list_should_add_an_entry() { #[test] fn test_parse_hsts_preload_should_return_none_when_json_invalid() { let mock_preload_content = "derp"; - assert!(HSTSList::new_from_preload(mock_preload_content).is_none(), "invalid preload list should not have parsed") + assert!(HSTSList::from_preload(mock_preload_content).is_none(), "invalid preload list should not have parsed") } #[test] fn test_parse_hsts_preload_should_return_none_when_json_contains_no_entries_key() { let mock_preload_content = "{\"nothing\": \"to see here\"}"; - assert!(HSTSList::new_from_preload(mock_preload_content).is_none(), "invalid preload list should not have parsed") + assert!(HSTSList::from_preload(mock_preload_content).is_none(), "invalid preload list should not have parsed") } #[test] @@ -168,7 +168,7 @@ fn test_parse_hsts_preload_should_decode_host_and_includes_subdomains() { \"include_subdomains\": false}\ ]\ }"; - let hsts_list = HSTSList::new_from_preload(mock_preload_content); + let hsts_list = HSTSList::from_preload(mock_preload_content); let entries = hsts_list.unwrap().entries; assert_eq!(entries[0].host, "mozilla.org");