[Cronet] Use Https for Quic Test Server

net/url_request/url_request_context_builder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/url_request/url_request_context_builder.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 333 matching lines @@
                                            false)));
   }
 
   if (http_server_properties_) {
     storage->set_http_server_properties(http_server_properties_.Pass());
   } else {
     storage->set_http_server_properties(
         scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl()));
   }
 
   storage->set_cert_verifier(CertVerifier::CreateDefault());

[pauljensen, 2015/10/15 19:13:07]

Can I recommend a simplification:
1. make UrlRequestContextBuilder::set_cert_verifier take a scoped_ptr
2. Pass() the CertVerifier into |storage| here
3. remove lines 385-386 that you added below
4. make MockCertVerifier simply contain a static function that returns a "long"
pointer to a native CertVerifier
5. get rid of the "owned by Java" comment

[mmenke, 2015/10/15 19:40:41]

I think 385-386 need to be changed to take the cert_verifier from the
URLRequestContext - the fact it doesn't currently do that looks like a bug.

[pauljensen, 2015/10/16 11:17:22]

I believe this already happens on line 367; this is why I proposed "Pass() the
CertVerifier into |storage| here" so it'll be first attached to the
URLRequestContext, and then copied to |network_session_params|.

[mmenke, 2015/10/16 13:25:35]

I'm not seeing where storage's cert_verified is set on network_session_params

Ahh, you're right - I completely missed that magic line...And I reviewed the CL
that added it, not that far back.

[pauljensen, 2015/10/16 13:30:56]

(Not sure if you meant to leave this line in, or your comment was a sequence of
thoughts, so I'll just answer to be absolutely sure we're on the same page:)
Line 367 calling line 215.

[mmenke, 2015/10/16 18:21:39]

I forgot I wrote that line, when I suddenly realized what was going on.  :(

[xunjieli, 2015/10/19 01:40:43]

Done. That's really neat. Thanks!

 
   if (throttling_enabled_) {
     storage->set_throttler_manager(
         make_scoped_ptr(new URLRequestThrottlerManager()));
   }
 
   if (backoff_enabled_) {
     storage->set_backoff_manager(
         make_scoped_ptr(new URLRequestBackoffManager()));
   }
@@ skipping 10 matching lines @@
   network_session_params.testing_fixed_https_port =
       http_network_session_params_.testing_fixed_https_port;
   network_session_params.use_alternative_services =
       http_network_session_params_.use_alternative_services;
   network_session_params.trusted_spdy_proxy =
       http_network_session_params_.trusted_spdy_proxy;
   network_session_params.next_protos = http_network_session_params_.next_protos;
   network_session_params.enable_quic = http_network_session_params_.enable_quic;
   network_session_params.quic_connection_options =
       http_network_session_params_.quic_connection_options;
+  network_session_params.cert_verifier =
+      http_network_session_params_.cert_verifier;
 
   scoped_ptr<HttpTransactionFactory> http_transaction_factory;
   if (http_cache_enabled_) {
     HttpCache::BackendFactory* http_cache_backend = NULL;
     if (http_cache_params_.type == HttpCacheParams::DISK) {
       http_cache_backend = new HttpCache::DefaultBackend(
           DISK_CACHE, CACHE_BACKEND_DEFAULT, http_cache_params_.path,
           http_cache_params_.max_size, context->GetFileTaskRunner());
     } else {
       http_cache_backend =
@@ skipping 45 matching lines @@
     }
     url_request_interceptors_.weak_clear();
   }
   storage->set_job_factory(top_job_factory.Pass());
   // TODO(willchan): Support sdch.
 
   return context.Pass();
 }
 
 }  // namespace net