diff options
author | bashi@chromium.org <bashi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 00:53:58 +0000 |
---|---|---|
committer | bashi@chromium.org <bashi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 00:53:58 +0000 |
commit | aa28181ebb378bdb9d7161d9414b3003b7bf118a (patch) | |
tree | cb3f94dbad59bd32c78945e181e61c6fb0fc1f27 /net/url_request | |
parent | 1075a530e0efc3a86ed6213c9b5a65a3d6cd74da (diff) | |
download | chromium_src-aa28181ebb378bdb9d7161d9414b3003b7bf118a.zip chromium_src-aa28181ebb378bdb9d7161d9414b3003b7bf118a.tar.gz chromium_src-aa28181ebb378bdb9d7161d9414b3003b7bf118a.tar.bz2 |
Adds NetworkDelegate::NotifyBeforeSocketStreamConnect()
This function will be called before an WebSocket tries to connect.
This function can do extra work such as policy checks to prevent the connect.
ChromeNetworkDelegate implements the function to check URL blacklist.
BUG=131046
TEST=net_unittests
Review URL: https://chromiumcodereview.appspot.com/10541046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141816 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r-- | net/url_request/url_request_context_builder.cc | 6 | ||||
-rw-r--r-- | net/url_request/url_request_test_util.cc | 6 | ||||
-rw-r--r-- | net/url_request/url_request_test_util.h | 3 |
3 files changed, 15 insertions, 0 deletions
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc index 23820d8..07b0d00 100644 --- a/net/url_request/url_request_context_builder.cc +++ b/net/url_request/url_request_context_builder.cc @@ -105,6 +105,12 @@ class BasicNetworkDelegate : public NetworkDelegate { return false; } + virtual int OnBeforeSocketStreamConnect( + SocketStream* stream, + const CompletionCallback& callback) OVERRIDE { + return OK; + } + DISALLOW_COPY_AND_ASSIGN(BasicNetworkDelegate); }; diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc index 6374bda..de814ef 100644 --- a/net/url_request/url_request_test_util.cc +++ b/net/url_request/url_request_test_util.cc @@ -498,6 +498,12 @@ bool TestNetworkDelegate::OnCanThrottleRequest( return true; } +int TestNetworkDelegate::OnBeforeSocketStreamConnect( + net::SocketStream* socket, + const net::CompletionCallback& callback) { + return net::OK; +} + // static std::string ScopedCustomUrlRequestTestHttpHost::value_("127.0.0.1"); diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h index 90a074b..2035fdf 100644 --- a/net/url_request/url_request_test_util.h +++ b/net/url_request/url_request_test_util.h @@ -246,6 +246,9 @@ class TestNetworkDelegate : public net::NetworkDelegate { const FilePath& path) const OVERRIDE; virtual bool OnCanThrottleRequest( const net::URLRequest& request) const OVERRIDE; + virtual int OnBeforeSocketStreamConnect( + net::SocketStream* stream, + const net::CompletionCallback& callback) OVERRIDE; void InitRequestStatesIfNew(int request_id); |