Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / net / url_request / url_request_context.cc

diff --git a/src/net/url_request/url_request_context.cc b/src/net/url_request/url_request_context.cc
index d6a4d2f..7f4e799 100644 (file)
--- a/src/net/url_request/url_request_context.cc
+++ b/src/net/url_request/url_request_context.cc
@@ -20,7 +20,7 @@ URLRequestContext::URLRequestContext()
     : net_log_(NULL),
       host_resolver_(NULL),
       cert_verifier_(NULL),
-      server_bound_cert_service_(NULL),
+      channel_id_service_(NULL),
       fraudulent_certificate_reporter_(NULL),
       http_auth_handler_factory_(NULL),
       proxy_service_(NULL),
@@ -31,6 +31,7 @@ URLRequestContext::URLRequestContext()
       http_transaction_factory_(NULL),
       job_factory_(NULL),
       throttler_manager_(NULL),
+      sdch_manager_(NULL),
       url_requests_(new std::set<const URLRequest*>) {
 }
 
@@ -43,7 +44,7 @@ void URLRequestContext::CopyFrom(const URLRequestContext* other) {
   set_net_log(other->net_log_);
   set_host_resolver(other->host_resolver_);
   set_cert_verifier(other->cert_verifier_);
-  set_server_bound_cert_service(other->server_bound_cert_service_);
+  set_channel_id_service(other->channel_id_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_);
@@ -56,6 +57,7 @@ void URLRequestContext::CopyFrom(const URLRequestContext* other) {
   set_http_transaction_factory(other->http_transaction_factory_);
   set_job_factory(other->job_factory_);
   set_throttler_manager(other->throttler_manager_);
+  set_sdch_manager(other->sdch_manager_);
   set_http_user_agent_settings(other->http_user_agent_settings_);
 }