Index: chrome/browser/policy/url_blacklist_manager_unittest.cc |
diff --git a/chrome/browser/policy/url_blacklist_manager_unittest.cc b/chrome/browser/policy/url_blacklist_manager_unittest.cc |
index 3e5ac0f52614212f9d8edb9ad1f5d267681f0a7d..b1f69d11139d9b645e3b146c56d66bfbf8e1b2ea 100644 |
--- a/chrome/browser/policy/url_blacklist_manager_unittest.cc |
+++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc |
@@ -240,31 +240,83 @@ INSTANTIATE_TEST_CASE_P( |
URLBlacklistFilterToComponentsTest, |
testing::Values( |
FilterTestParams("google.com", |
- "", ".google.com", true, 0u, ""), |
+ std::string(), |
+ ".google.com", |
+ true, |
+ 0u, |
+ std::string()), |
FilterTestParams(".google.com", |
- "", "google.com", false, 0u, ""), |
+ std::string(), |
+ "google.com", |
+ false, |
+ 0u, |
+ std::string()), |
FilterTestParams("http://google.com", |
- "http", ".google.com", true, 0u, ""), |
+ "http", |
+ ".google.com", |
+ true, |
+ 0u, |
+ std::string()), |
FilterTestParams("google.com/", |
- "", ".google.com", true, 0u, "/"), |
+ std::string(), |
+ ".google.com", |
+ true, |
+ 0u, |
+ "/"), |
FilterTestParams("http://google.com:8080/whatever", |
- "http", ".google.com", true, 8080u, "/whatever"), |
+ "http", |
+ ".google.com", |
+ true, |
+ 8080u, |
+ "/whatever"), |
FilterTestParams("http://user:pass@google.com:8080/whatever", |
- "http", ".google.com", true, 8080u, "/whatever"), |
+ "http", |
+ ".google.com", |
+ true, |
+ 8080u, |
+ "/whatever"), |
FilterTestParams("123.123.123.123", |
- "", "123.123.123.123", false, 0u, ""), |
+ std::string(), |
+ "123.123.123.123", |
+ false, |
+ 0u, |
+ std::string()), |
FilterTestParams("https://123.123.123.123", |
- "https", "123.123.123.123", false, 0u, ""), |
+ "https", |
+ "123.123.123.123", |
+ false, |
+ 0u, |
+ std::string()), |
FilterTestParams("123.123.123.123/", |
- "", "123.123.123.123", false, 0u, "/"), |
+ std::string(), |
+ "123.123.123.123", |
+ false, |
+ 0u, |
+ "/"), |
FilterTestParams("http://123.123.123.123:123/whatever", |
- "http", "123.123.123.123", false, 123u, "/whatever"), |
+ "http", |
+ "123.123.123.123", |
+ false, |
+ 123u, |
+ "/whatever"), |
FilterTestParams("*", |
- "", "", true, 0u, ""), |
+ std::string(), |
+ std::string(), |
+ true, |
+ 0u, |
+ std::string()), |
FilterTestParams("ftp://*", |
- "ftp", "", true, 0u, ""), |
+ "ftp", |
+ std::string(), |
+ true, |
+ 0u, |
+ std::string()), |
FilterTestParams("http://*/whatever", |
- "http", "", true, 0u, "/whatever"))); |
+ "http", |
+ std::string(), |
+ true, |
+ 0u, |
+ "/whatever"))); |
TEST_F(URLBlacklistManagerTest, Filtering) { |
URLBlacklist blacklist; |