Adds NetworkDelegate::NotifyBeforeSocketStreamConnect()

chrome/browser/policy/url_blacklist_manager_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/policy/url_blacklist_manager.h"
 
 #include <ostream>
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
@@ skipping 232 matching lines @@
 }
 
 TEST_F(URLBlacklistManagerTest, SchemeToFlag) {
   URLBlacklist::SchemeFlag flag;
   EXPECT_TRUE(URLBlacklist::SchemeToFlag("http", &flag));
   EXPECT_EQ(URLBlacklist::SCHEME_HTTP, flag);
   EXPECT_TRUE(URLBlacklist::SchemeToFlag("https", &flag));
   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));
 }
 
 INSTANTIATE_TEST_CASE_P(
     URLBlacklistFilterToComponentsTestInstance,
     URLBlacklistFilterToComponentsTest,
     testing::Values(
         FilterTestParams("google.com",
@@ skipping 30 matching lines @@
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://google.com/")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://google.com/whatever")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("https://google.com/")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("bogus://google.com/")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://mail.google.com")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://x.mail.google.com")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("https://x.mail.google.com/")));
   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");
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://path.to/ruin")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("https://path.to/ruin")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://path.to/ruins")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://path.to/ruin/signup")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://www.path.to/ruin")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("http://path.to/fortune")));
 
   // Filter only a certain path prefix and scheme.
   blacklist.Block("https://s.aaa.com/path");
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("https://s.aaa.com/path")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("https://s.aaa.com/path/bbb")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("http://s.aaa.com/path")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://aaa.com/path")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://x.aaa.com/path")));
   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");
   blacklist.Block("https://s.xxx.com/a/b/c");
   blacklist.Allow("https://s.xxx.com/a/b/c/d");
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://s.xxx.com/a")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://s.xxx.com/a/x")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("https://s.xxx.com/a/x")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("http://s.xxx.com/a/b")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://s.xxx.com/a/b")));
@@ skipping 64 matching lines @@
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://mail.google.com")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://s.mail.google.com")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("https://very.safe/")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://very.safe/path")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://very.safe/path")));
 }
 
 }  // namespace
 
 }  // namespace policy