Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1011)

Unified Diff: net/http/http_pipelined_host_pool_unittest.cc

Issue 9959033: Move NextProto enum to a new file net/socket/next_proto.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address wtc's comments Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_pipelined_host_pool.cc ('k') | net/http/http_pipelined_host_test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_pipelined_host_pool_unittest.cc
diff --git a/net/http/http_pipelined_host_pool_unittest.cc b/net/http/http_pipelined_host_pool_unittest.cc
index 11db1e948e1a213a78b2d6c218e3fdc67f0171fc..3064f234b8182ebcf1cd3a8660b714487aa95ae4 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) {
« no previous file with comments | « net/http/http_pipelined_host_pool.cc ('k') | net/http/http_pipelined_host_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698