diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-31 03:58:46 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-31 03:58:46 +0000 |
| commit | 8e3c78cb4857505329f602e6af71a46d05346e99 (patch) | |
| tree | 0f42439dbfdea47be8189bc39d682062d071d3ec /net/socket/socket_test_util.h | |
| parent | 9822df966d60c67faaf4c4adacc70801aed9edaf (diff) | |
| download | chromium_src-8e3c78cb4857505329f602e6af71a46d05346e99.zip chromium_src-8e3c78cb4857505329f602e6af71a46d05346e99.tar.gz chromium_src-8e3c78cb4857505329f602e6af71a46d05346e99.tar.bz2 | |
Move NextProto enum to a new file net/socket/next_proto.h
BUG=120890
Review URL: http://codereview.chromium.org/9959033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socket_test_util.h')
| -rw-r--r-- | net/socket/socket_test_util.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h index f678614..dbac707 100644 --- a/net/socket/socket_test_util.h +++ b/net/socket/socket_test_util.h @@ -269,14 +269,14 @@ struct SSLSocketDataProvider { SSLSocketDataProvider(IoMode mode, int result); ~SSLSocketDataProvider(); - void SetNextProto(SSLClientSocket::NextProto proto); + void SetNextProto(NextProto proto); MockConnect connect; SSLClientSocket::NextProtoStatus next_proto_status; std::string next_proto; std::string server_protos; bool was_npn_negotiated; - SSLClientSocket::NextProto protocol_negotiated; + NextProto protocol_negotiated; bool client_cert_sent; SSLCertRequestInfo* cert_request_info; scoped_refptr<X509Certificate> cert; @@ -750,9 +750,9 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket { std::string* server_protos) OVERRIDE; virtual bool was_npn_negotiated() const OVERRIDE; virtual bool set_was_npn_negotiated(bool negotiated) OVERRIDE; - virtual SSLClientSocket::NextProto protocol_negotiated() const OVERRIDE; + virtual NextProto protocol_negotiated() const OVERRIDE; virtual void set_protocol_negotiated( - SSLClientSocket::NextProto protocol_negotiated) OVERRIDE; + NextProto protocol_negotiated) OVERRIDE; // This MockSocket does not implement the manual async IO feature. virtual void OnReadComplete(const MockRead& data) OVERRIDE; @@ -774,7 +774,7 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket { bool new_npn_value_; bool was_used_to_convey_data_; bool is_protocol_negotiated_set_; - SSLClientSocket::NextProto protocol_negotiated_; + NextProto protocol_negotiated_; }; class MockUDPClientSocket : public DatagramClientSocket, |