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

Side by Side Diff: components/grpc_support/test/get_stream_engine.cc

Issue 2901093004: Add and persist a new field in AlternativeServiceInfo to list QUIC verisons advertised (Closed)
Patch Set: fix cronet/grpc Created 3 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/lazy_instance.h" 5 #include "base/lazy_instance.h"
6 #include "base/macros.h" 6 #include "base/macros.h"
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 mock_cert_verifier_.reset(new net::MockCertVerifier()); 46 mock_cert_verifier_.reset(new net::MockCertVerifier());
47 mock_cert_verifier_->set_default_result(net::OK); 47 mock_cert_verifier_->set_default_result(net::OK);
48 server_properties_.reset(new net::HttpServerPropertiesImpl()); 48 server_properties_.reset(new net::HttpServerPropertiesImpl());
49 49
50 // Need to enable QUIC for the test server. 50 // Need to enable QUIC for the test server.
51 auto params = base::MakeUnique<net::HttpNetworkSession::Params>(); 51 auto params = base::MakeUnique<net::HttpNetworkSession::Params>();
52 params->enable_quic = true; 52 params->enable_quic = true;
53 params->enable_http2 = true; 53 params->enable_http2 = true;
54 net::AlternativeService alternative_service(net::kProtoQUIC, "", 443); 54 net::AlternativeService alternative_service(net::kProtoQUIC, "", 443);
55 url::SchemeHostPort quic_hint_server("https", kTestServerHost, 443); 55 url::SchemeHostPort quic_hint_server("https", kTestServerHost, 443);
56 server_properties_->SetAlternativeService( 56 server_properties_->SetQuicAlternativeService(
Bence 2017/06/16 14:43:40 I believe this should be called with an empty Quic
Zhongyi Shi 2017/06/20 23:23:37 Acknowledged.
57 quic_hint_server, alternative_service, base::Time::Max()); 57 quic_hint_server, alternative_service, base::Time::Max(),
58 params->quic_supported_versions);
58 59
59 request_context_->set_cert_verifier(mock_cert_verifier_.get()); 60 request_context_->set_cert_verifier(mock_cert_verifier_.get());
60 request_context_->set_host_resolver(host_resolver_.get()); 61 request_context_->set_host_resolver(host_resolver_.get());
61 request_context_->set_http_server_properties(server_properties_.get()); 62 request_context_->set_http_server_properties(server_properties_.get());
62 request_context_->set_http_network_session_params(std::move(params)); 63 request_context_->set_http_network_session_params(std::move(params));
63 64
64 request_context_->Init(); 65 request_context_->Init();
65 } 66 }
66 return request_context_.get(); 67 return request_context_.get();
67 } 68 }
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 g_request_context_getter_.Get()->SetTestServerPort(port); 126 g_request_context_getter_.Get()->SetTestServerPort(port);
126 static stream_engine engine; 127 static stream_engine engine;
127 engine.obj = g_request_context_getter_.Get().get(); 128 engine.obj = g_request_context_getter_.Get().get();
128 return &engine; 129 return &engine;
129 } 130 }
130 131
131 void StartTestStreamEngine(int port) {} 132 void StartTestStreamEngine(int port) {}
132 void ShutdownTestStreamEngine() {} 133 void ShutdownTestStreamEngine() {}
133 134
134 } // namespace grpc_support 135 } // namespace grpc_support
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698