Fix leak of MultiThreadedCertVerifier in ProfileIOData.

chrome/browser/profiles/profile_io_data.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 29 matching lines @@
 class MediaDeviceIDSalt;
 class ProtocolHandlerRegistry;
 class SigninNamesOnIOThread;
 class SupervisedUserURLFilter;
 
 namespace extensions {
 class InfoMap;
 }
 
 namespace net {
+class CertVerifier;
 class ChannelIDService;
 class CookieStore;
 class FraudulentCertificateReporter;
 class FtpTransactionFactory;
 class HttpServerProperties;
 class HttpTransactionFactory;
 class ProxyConfigService;
 class ProxyService;
 class SSLConfigService;
 class TransportSecurityPersister;
@@ skipping 520 matching lines @@
 #endif
   mutable scoped_ptr<net::ChannelIDService> channel_id_service_;
   mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_;
   mutable scoped_ptr<net::FraudulentCertificateReporter>
       fraudulent_certificate_reporter_;
   mutable scoped_ptr<net::ProxyService> proxy_service_;
   mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
   mutable scoped_ptr<net::HttpServerProperties>
       http_server_properties_;
 #if defined(OS_CHROMEOS)
-  mutable scoped_ptr<policy::PolicyCertVerifier> cert_verifier_;
+  // Set if a PolicyCertVerifier is used. Owned by |cert_verifier_|.

[mattm, 2014/08/27 18:50:28]

Maybe add / clarify comment that cert_verifier_ will still be set when
policy_cert_verifier_ is NULL? Maybe something like "Set if |cert_verifier_| is
a PolicyCertVerifier."?

+  mutable policy::PolicyCertVerifier* policy_cert_verifier_;
+  mutable scoped_ptr<net::CertVerifier> cert_verifier_;
   mutable std::string username_hash_;
   mutable bool use_system_key_slot_;
 #endif
 
   mutable scoped_ptr<net::TransportSecurityPersister>
       transport_security_persister_;
 
   // These are only valid in between LazyInitialize() and their accessor being
   // called.
   mutable scoped_ptr<net::URLRequestContext> main_request_context_;
@@ skipping 20 matching lines @@
 
   // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
   bool initialized_on_UI_thread_;
 
   const Profile::ProfileType profile_type_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_