summaryrefslogtreecommitdiffstats
path: root/net/http/http_pipelined_host_test_util.h
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-31 03:58:46 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-31 03:58:46 +0000
commit8e3c78cb4857505329f602e6af71a46d05346e99 (patch)
tree0f42439dbfdea47be8189bc39d682062d071d3ec /net/http/http_pipelined_host_test_util.h
parent9822df966d60c67faaf4c4adacc70801aed9edaf (diff)
downloadchromium_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_test_util.h')
-rw-r--r--net/http/http_pipelined_host_test_util.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/http/http_pipelined_host_test_util.h b/net/http/http_pipelined_host_test_util.h
index eeb7b34..245ff02 100644
--- a/net/http/http_pipelined_host_test_util.h
+++ b/net/http/http_pipelined_host_test_util.h
@@ -33,7 +33,7 @@ class MockPipelineFactory : public HttpPipelinedConnection::Factory {
const ProxyInfo& used_proxy_info,
const BoundNetLog& net_log,
bool was_npn_negotiated,
- SSLClientSocket::NextProto protocol_negotiated));
+ NextProto protocol_negotiated));
};
class MockPipeline : public HttpPipelinedConnection {
@@ -57,7 +57,7 @@ class MockPipeline : public HttpPipelinedConnection {
MOCK_CONST_METHOD0(used_proxy_info, const ProxyInfo&());
MOCK_CONST_METHOD0(net_log, const BoundNetLog&());
MOCK_CONST_METHOD0(was_npn_negotiated, bool());
- MOCK_CONST_METHOD0(protocol_negotiated, SSLClientSocket::NextProto());
+ MOCK_CONST_METHOD0(protocol_negotiated, NextProto());
private:
int depth_;