Adds NetworkDelegate::NotifyBeforeSocketStreamConnect()

chrome/browser/policy/url_blacklist_manager_unittest.cc

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 da1760abee26aa3ba9ecf039037be450b9eecab3..332f964a47ab018d582f739727ef11940f75eadc 100644
--- a/chrome/browser/policy/url_blacklist_manager_unittest.cc
+++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc
@@ -250,6 +250,10 @@ TEST_F(URLBlacklistManagerTest, SchemeToFlag) {
   EXPECT_EQ(URLBlacklist::SCHEME_HTTPS, flag);
   EXPECT_TRUE(URLBlacklist::SchemeToFlag("ftp", &flag));
   EXPECT_EQ(URLBlacklist::SCHEME_FTP, flag);
+  EXPECT_TRUE(URLBlacklist::SchemeToFlag("ws", &flag));
+  EXPECT_EQ(URLBlacklist::SCHEME_WS, flag);
+  EXPECT_TRUE(URLBlacklist::SchemeToFlag("wss", &flag));
+  EXPECT_EQ(URLBlacklist::SCHEME_WSS, flag);
   EXPECT_TRUE(URLBlacklist::SchemeToFlag("", &flag));
   EXPECT_EQ(URLBlacklist::SCHEME_ALL, flag);
   EXPECT_FALSE(URLBlacklist::SchemeToFlag("wtf", &flag));
@@ -300,15 +304,19 @@ TEST_F(URLBlacklistManagerTest, Filtering) {
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://x.y.google.com/a/b")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("http://youtube.com/")));
 
-  // Filter only http and ftp schemes.
+  // Filter only http, ftp and ws schemes.
   blacklist.Block("http://secure.com");
   blacklist.Block("ftp://secure.com");
+  blacklist.Block("ws://secure.com");
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://secure.com")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://secure.com/whatever")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("ftp://secure.com/")));
+  EXPECT_TRUE(blacklist.IsURLBlocked(GURL("ws://secure.com")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://secure.com/")));
+  EXPECT_FALSE(blacklist.IsURLBlocked(GURL("wss://secure.com")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://www.secure.com")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://www.secure.com")));
+  EXPECT_FALSE(blacklist.IsURLBlocked(GURL("wss://www.secure.com")));
 
   // Filter only a certain path prefix.
   blacklist.Block("path.to/ruin");
@@ -329,6 +337,15 @@ TEST_F(URLBlacklistManagerTest, Filtering) {
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://s.aaa.com/bbb")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://s.aaa.com/")));
 
+  // Filter only ws and wss schemes.
+  blacklist.Block("ws://ws.aaa.com");
+  blacklist.Block("wss://ws.aaa.com");
+  EXPECT_TRUE(blacklist.IsURLBlocked(GURL("ws://ws.aaa.com")));
+  EXPECT_TRUE(blacklist.IsURLBlocked(GURL("wss://ws.aaa.com")));
+  EXPECT_FALSE(blacklist.IsURLBlocked(GURL("http://ws.aaa.com")));
+  EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://ws.aaa.com")));
+  EXPECT_FALSE(blacklist.IsURLBlocked(GURL("ftp://ws.aaa.com")));
+
   // Test exceptions to path prefixes, and most specific matches.
   blacklist.Block("s.xxx.com/a");
   blacklist.Allow("s.xxx.com/a/b");