Update from https://crrev.com/312398

net/url_request/url_request_context_storage.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_storage.h"
 
 #include "base/logging.h"
 #include "net/base/net_log.h"
 #include "net/base/network_delegate.h"
 #include "net/base/sdch_manager.h"
@@ skipping 31 matching lines @@
   context_->set_host_resolver(host_resolver.get());
   host_resolver_ = host_resolver.Pass();
 }
 
 void URLRequestContextStorage::set_cert_verifier(CertVerifier* cert_verifier) {
   context_->set_cert_verifier(cert_verifier);
   cert_verifier_.reset(cert_verifier);
 }
 
 void URLRequestContextStorage::set_channel_id_service(
-    ChannelIDService* channel_id_service) {
-  context_->set_channel_id_service(channel_id_service);
-  channel_id_service_.reset(channel_id_service);
+    scoped_ptr<ChannelIDService> channel_id_service) {
+  context_->set_channel_id_service(channel_id_service.get());
+  channel_id_service_ = channel_id_service.Pass();
 }
 
 void URLRequestContextStorage::set_fraudulent_certificate_reporter(
     FraudulentCertificateReporter* fraudulent_certificate_reporter) {
   context_->set_fraudulent_certificate_reporter(
       fraudulent_certificate_reporter);
   fraudulent_certificate_reporter_.reset(fraudulent_certificate_reporter);
 }
 
 void URLRequestContextStorage::set_http_auth_handler_factory(
@@ skipping 60 matching lines @@
   http_user_agent_settings_.reset(http_user_agent_settings);
 }
 
 void URLRequestContextStorage::set_sdch_manager(
     scoped_ptr<SdchManager> sdch_manager) {
   context_->set_sdch_manager(sdch_manager.get());
   sdch_manager_ = sdch_manager.Pass();
 }
 
 }  // namespace net