| Index: net/cert/nss_profile_filter_chromeos.cc
|
| diff --git a/net/cert/nss_profile_filter_chromeos.cc b/net/cert/nss_profile_filter_chromeos.cc
|
| index e555750b89c7bd62058dd008577f1bf9c6250655..fb2926c9ae1248460b11f8f51c5960af2a51a04a 100644
|
| --- a/net/cert/nss_profile_filter_chromeos.cc
|
| +++ b/net/cert/nss_profile_filter_chromeos.cc
|
| @@ -33,28 +33,28 @@ std::string CertSlotsString(CERTCertificate* cert) {
|
|
|
| } // namespace
|
|
|
| -NSSProfileFilterChromeOS::NSSProfileFilterChromeOS() {}
|
| +NSSProfileFilterChromeOS::NSSProfileFilterChromeOS() {
|
| +}
|
|
|
| NSSProfileFilterChromeOS::NSSProfileFilterChromeOS(
|
| const NSSProfileFilterChromeOS& other) {
|
| - public_slot_.reset(other.public_slot_ ?
|
| - PK11_ReferenceSlot(other.public_slot_.get()) :
|
| - NULL);
|
| - private_slot_.reset(other.private_slot_ ?
|
| - PK11_ReferenceSlot(other.private_slot_.get()) :
|
| - NULL);
|
| + public_slot_.reset(
|
| + other.public_slot_ ? PK11_ReferenceSlot(other.public_slot_.get()) : NULL);
|
| + private_slot_.reset(other.private_slot_
|
| + ? PK11_ReferenceSlot(other.private_slot_.get())
|
| + : NULL);
|
| }
|
|
|
| -NSSProfileFilterChromeOS::~NSSProfileFilterChromeOS() {}
|
| +NSSProfileFilterChromeOS::~NSSProfileFilterChromeOS() {
|
| +}
|
|
|
| NSSProfileFilterChromeOS& NSSProfileFilterChromeOS::operator=(
|
| const NSSProfileFilterChromeOS& other) {
|
| - public_slot_.reset(other.public_slot_ ?
|
| - PK11_ReferenceSlot(other.public_slot_.get()) :
|
| - NULL);
|
| - private_slot_.reset(other.private_slot_ ?
|
| - PK11_ReferenceSlot(other.private_slot_.get()) :
|
| - NULL);
|
| + public_slot_.reset(
|
| + other.public_slot_ ? PK11_ReferenceSlot(other.public_slot_.get()) : NULL);
|
| + private_slot_.reset(other.private_slot_
|
| + ? PK11_ReferenceSlot(other.private_slot_.get())
|
| + : NULL);
|
| return *this;
|
| }
|
|
|
| @@ -121,7 +121,8 @@ bool NSSProfileFilterChromeOS::IsCertAllowed(CERTCertificate* cert) const {
|
|
|
| NSSProfileFilterChromeOS::CertNotAllowedForProfilePredicate::
|
| CertNotAllowedForProfilePredicate(const NSSProfileFilterChromeOS& filter)
|
| - : filter_(filter) {}
|
| + : filter_(filter) {
|
| +}
|
|
|
| bool NSSProfileFilterChromeOS::CertNotAllowedForProfilePredicate::operator()(
|
| const scoped_refptr<X509Certificate>& cert) const {
|
| @@ -130,7 +131,8 @@ bool NSSProfileFilterChromeOS::CertNotAllowedForProfilePredicate::operator()(
|
|
|
| NSSProfileFilterChromeOS::ModuleNotAllowedForProfilePredicate::
|
| ModuleNotAllowedForProfilePredicate(const NSSProfileFilterChromeOS& filter)
|
| - : filter_(filter) {}
|
| + : filter_(filter) {
|
| +}
|
|
|
| bool NSSProfileFilterChromeOS::ModuleNotAllowedForProfilePredicate::operator()(
|
| const scoped_refptr<CryptoModule>& module) const {
|
| @@ -138,4 +140,3 @@ bool NSSProfileFilterChromeOS::ModuleNotAllowedForProfilePredicate::operator()(
|
| }
|
|
|
| } // namespace net
|
| -
|
|
|