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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_stream_factory_impl_job_controller_unittest.cc

Issue 2373663002: Unify enum NextProto and enum AlternateProtocol. (Closed)
Patch Set: Fix compile errors. Created 4 years, 1 month 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_stream_factory_impl_job_controller.cc ('k') | net/http/http_stream_factory_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_job_controller_unittest.cc
diff --git a/net/http/http_stream_factory_impl_job_controller_unittest.cc b/net/http/http_stream_factory_impl_job_controller_unittest.cc
index 5ce1453946fb7ef6c04a2e5fa8c84cfbd5070c70..6ce0abfec5e55cb9faca0111144cedd360db21fc 100644
--- a/net/http/http_stream_factory_impl_job_controller_unittest.cc
+++ b/net/http/http_stream_factory_impl_job_controller_unittest.cc
@@ -261,7 +261,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest, CancelJobsBeforeBinding) {
request_info.url = GURL("https://www.google.com");
url::SchemeHostPort server(request_info.url);
- AlternativeService alternative_service(QUIC, server.host(), 443);
+ AlternativeService alternative_service(kProtoQUIC, server.host(), 443);
SetAlternativeService(request_info, alternative_service);
request_.reset(
@@ -295,7 +295,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest, OnStreamFailedForBothJobs) {
request_info.url = GURL("https://www.google.com");
url::SchemeHostPort server(request_info.url);
- AlternativeService alternative_service(QUIC, server.host(), 443);
+ AlternativeService alternative_service(kProtoQUIC, server.host(), 443);
SetAlternativeService(request_info, alternative_service);
request_.reset(
@@ -339,7 +339,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest,
request_info.url = GURL("https://www.google.com");
url::SchemeHostPort server(request_info.url);
- AlternativeService alternative_service(QUIC, server.host(), 443);
+ AlternativeService alternative_service(kProtoQUIC, server.host(), 443);
SetAlternativeService(request_info, alternative_service);
request_.reset(
@@ -390,7 +390,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest,
request_info.url = GURL("https://www.google.com");
url::SchemeHostPort server(request_info.url);
- AlternativeService alternative_service(QUIC, server.host(), 443);
+ AlternativeService alternative_service(kProtoQUIC, server.host(), 443);
SetAlternativeService(request_info, alternative_service);
request_.reset(
@@ -435,7 +435,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest,
request_info.url = GURL("https://www.google.com");
url::SchemeHostPort server(request_info.url);
- AlternativeService alternative_service(QUIC, server.host(), 443);
+ AlternativeService alternative_service(kProtoQUIC, server.host(), 443);
SetAlternativeService(request_info, alternative_service);
request_.reset(
@@ -482,7 +482,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest, GetLoadStateAfterMainJobFailed) {
request_info.url = GURL("https://www.google.com");
url::SchemeHostPort server(request_info.url);
- AlternativeService alternative_service(QUIC, server.host(), 443);
+ AlternativeService alternative_service(kProtoQUIC, server.host(), 443);
SetAlternativeService(request_info, alternative_service);
request_.reset(
@@ -531,7 +531,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest, DoNotResumeMainJobBeforeWait) {
request_info.url = GURL("https://www.google.com");
url::SchemeHostPort server(request_info.url);
- AlternativeService alternative_service(QUIC, server.host(), 443);
+ AlternativeService alternative_service(kProtoQUIC, server.host(), 443);
SetAlternativeService(request_info, alternative_service);
request_.reset(
@@ -556,7 +556,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest, InvalidPortForQuic) {
request_info.url = GURL("https://www.google.com");
url::SchemeHostPort server(request_info.url);
- AlternativeService alternative_service(QUIC, server.host(), 101);
+ AlternativeService alternative_service(kProtoQUIC, server.host(), 101);
SetAlternativeService(request_info, alternative_service);
request_.reset(
@@ -598,7 +598,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest,
// Set a SPDY alternative service for the server.
url::SchemeHostPort server(request_info.url);
- AlternativeService alternative_service(QUIC, server.host(), 443);
+ AlternativeService alternative_service(kProtoQUIC, server.host(), 443);
SetAlternativeService(request_info, alternative_service);
// Hack to use different URL for the main job to help differentiate the proxy
// requests.
@@ -660,7 +660,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest,
request_info.url = GURL("https://www.google.com");
url::SchemeHostPort server(request_info.url);
- AlternativeService alternative_service(QUIC, server.host(), 443);
+ AlternativeService alternative_service(kProtoQUIC, server.host(), 443);
SetAlternativeService(request_info, alternative_service);
// Hack to use different URL for the main job to help differentiate the proxy
// requests.
@@ -722,7 +722,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest, DelayedTCP) {
// Set a SPDY alternative service for the server.
url::SchemeHostPort server(request_info.url);
- AlternativeService alternative_service(QUIC, server.host(), 443);
+ AlternativeService alternative_service(kProtoQUIC, server.host(), 443);
SetAlternativeService(request_info, alternative_service);
request_.reset(
« no previous file with comments | « net/http/http_stream_factory_impl_job_controller.cc ('k') | net/http/http_stream_factory_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698