Replace c/b/nss_context by a KeyedService.

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 24 matching lines @@
 class ChromeNetworkDelegate;
 class ChromeURLRequestContextGetter;
 class CookieSettings;
 class DevToolsNetworkController;
 class HostContentSettingsMap;
 class MediaDeviceIDSalt;
 class ProtocolHandlerRegistry;
 class SigninNamesOnIOThread;
 class SupervisedUserURLFilter;
 
+class CertDatabaseServiceIOPart;
+
 namespace extensions {
 class InfoMap;
 }
 
 namespace net {
 class CertVerifier;
 class ChannelIDService;
 class CookieStore;
 class FraudulentCertificateReporter;
 class FtpTransactionFactory;
@@ skipping 154 matching lines @@
 
   DevToolsNetworkController* network_controller() const {
     return network_controller_.get();
   }
 
   net::TransportSecurityState* transport_security_state() const {
     return transport_security_state_.get();
   }
 
 #if defined(OS_CHROMEOS)
   std::string username_hash() const {

[mattm, 2014/09/05 07:35:29]

I think this can be removed too

[pneubeck (no reviews), 2014/09/05 08:04:56]

Yes, I've removed it now from ProfileIOData.
But sadly we can't remove it from ProfileParams yet, because we still use it in
ProfileIOData::Init:
 ..public_slot.. =
crypto::GetPublicSlotForChromeOSUser(profile_params_->username_hash)
  ... new chromeos::CertVerifyProcChromeOS(public_slot.Pass()))

The new ServiceIOPart can't be used in this case without further adaptions,
because CertVerifyProcChromeOS expects the public_slot to be available at
construction time.

     return username_hash_;
   }
-
-  bool use_system_key_slot() const { return use_system_key_slot_; }
 #endif
 
   Profile::ProfileType profile_type() const {
     return profile_type_;
   }
 
   bool IsOffTheRecord() const;
 
   IntegerPrefMember* incognito_availibility() const {
     return &incognito_availibility_pref_;
@@ skipping 93 matching lines @@
     // because on linux it relies on initializing things through gconf,
     // and needs to be on the main thread.
     scoped_ptr<net::ProxyConfigService> proxy_config_service;
 
 #if defined(ENABLE_MANAGED_USERS)
     scoped_refptr<const SupervisedUserURLFilter> supervised_user_url_filter;
 #endif
 
 #if defined(OS_CHROMEOS)
     std::string username_hash;
-    bool use_system_key_slot;
 #endif
 
     // The profile this struct was populated from. It's passed as a void* to
     // ensure it's not accidently used on the IO thread. Before using it on the
     // UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
     void* profile;
 
     prerender::PrerenderTracker* prerender_tracker;
   };
 
@@ skipping 238 matching lines @@
   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)
   // Set to |cert_verifier_| if it references a PolicyCertVerifier. In that
   // case, the verifier is owned by  |cert_verifier_|. Otherwise, set to NULL.
   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
+
+#if defined(USE_NSS)
+  mutable base::WeakPtr<CertDatabaseServiceIOPart> cert_db_io_;
 #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_;
   mutable scoped_ptr<net::URLRequestContext> extensions_request_context_;
   // One URLRequestContext per isolated app for main and media requests.
@@ skipping 18 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_