| Index: net/url_request/url_request_context.cc
|
| diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc
|
| index 13a1b0d5e6153bff3bfab8d748711ed676106b07..53ad9406162e4655f467c3614aae96e32b7614a8 100644
|
| --- a/net/url_request/url_request_context.cc
|
| +++ b/net/url_request/url_request_context.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// 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.
|
|
|
| @@ -18,7 +18,7 @@ URLRequestContext::URLRequestContext()
|
| net_log_(NULL),
|
| host_resolver_(NULL),
|
| cert_verifier_(NULL),
|
| - origin_bound_cert_service_(NULL),
|
| + server_bound_cert_service_(NULL),
|
| fraudulent_certificate_reporter_(NULL),
|
| http_auth_handler_factory_(NULL),
|
| proxy_service_(NULL),
|
| @@ -36,7 +36,7 @@ void URLRequestContext::CopyFrom(URLRequestContext* other) {
|
| set_net_log(other->net_log());
|
| set_host_resolver(other->host_resolver());
|
| set_cert_verifier(other->cert_verifier());
|
| - set_origin_bound_cert_service(other->origin_bound_cert_service());
|
| + set_server_bound_cert_service(other->server_bound_cert_service());
|
| set_fraudulent_certificate_reporter(other->fraudulent_certificate_reporter());
|
| set_http_auth_handler_factory(other->http_auth_handler_factory());
|
| set_proxy_service(other->proxy_service());
|
|
|