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/http/http_pipelined_host_pool_unittest.cc | |
| 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/http/http_pipelined_host_pool_unittest.cc')
| -rw-r--r-- | net/http/http_pipelined_host_pool_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/http/http_pipelined_host_pool_unittest.cc b/net/http/http_pipelined_host_pool_unittest.cc index 11db1e9..3064f23 100644 --- a/net/http/http_pipelined_host_pool_unittest.cc +++ b/net/http/http_pipelined_host_pool_unittest.cc @@ -56,7 +56,7 @@ class MockHost : public HttpPipelinedHost { const ProxyInfo& used_proxy_info, const BoundNetLog& net_log, bool was_npn_negotiated, - SSLClientSocket::NextProto protocol_negotiated)); + NextProto protocol_negotiated)); MOCK_METHOD0(CreateStreamOnExistingPipeline, HttpPipelinedStream*()); MOCK_CONST_METHOD0(IsExistingPipelineAvailable, bool()); MOCK_CONST_METHOD0(PipelineInfoToValue, base::Value*()); @@ -77,7 +77,7 @@ class HttpPipelinedHostPoolTest : public testing::Test { pool_(new HttpPipelinedHostPool(&delegate_, factory_, http_server_properties_.get(), false)), was_npn_negotiated_(false), - protocol_negotiated_(SSLClientSocket::kProtoUnknown) { + protocol_negotiated_(kProtoUnknown) { } void CreateDummyStream(const HttpPipelinedHost::Key& key, @@ -124,7 +124,7 @@ class HttpPipelinedHostPoolTest : public testing::Test { const ProxyInfo proxy_info_; const BoundNetLog net_log_; bool was_npn_negotiated_; - SSLClientSocket::NextProto protocol_negotiated_; + NextProto protocol_negotiated_; }; TEST_F(HttpPipelinedHostPoolTest, DefaultUnknown) { |