Index: net/cert/internal/cert_error_params.cc |
diff --git a/net/cert/internal/cert_error_params.cc b/net/cert/internal/cert_error_params.cc |
index 08ddfca062d184ce9dfb9d70cb17ea7e2b4954b5..d56f14e4ed9e47a7c557e01cdbf734cca48bb827 100644 |
--- a/net/cert/internal/cert_error_params.cc |
+++ b/net/cert/internal/cert_error_params.cc |
@@ -65,15 +65,38 @@ class CertErrorParamsSizeT : public CertErrorParams { |
size_t value_; |
}; |
+// Parameters subclass for describing (and pretty-printing) two size_t |
+// values. |
+class CertErrorParams2SizeT : public CertErrorParams { |
+ public: |
+ CertErrorParams2SizeT(const char* name1, |
+ size_t value1, |
+ const char* name2, |
+ size_t value2) |
+ : name1_(name1), value1_(value1), name2_(name2), value2_(value2) {} |
+ |
+ std::string ToDebugString() const override { |
+ return name1_ + std::string(": ") + base::SizeTToString(value1_) + "\n" + |
+ name2_ + std::string(": ") + base::SizeTToString(value2_); |
+ } |
+ |
+ private: |
+ const char* name1_; |
+ size_t value1_; |
+ const char* name2_; |
+ size_t value2_; |
+}; |
+ |
} // namespace |
CertErrorParams::CertErrorParams() = default; |
CertErrorParams::~CertErrorParams() = default; |
std::unique_ptr<CertErrorParams> CreateCertErrorParams1Der( |
- const char* name1, |
- const der::Input& der1) { |
- return base::MakeUnique<CertErrorParams2Der>(name1, der1, nullptr, |
+ const char* name, |
+ const der::Input& der) { |
+ DCHECK(name); |
+ return base::MakeUnique<CertErrorParams2Der>(name, der, nullptr, |
der::Input()); |
} |
@@ -82,12 +105,25 @@ std::unique_ptr<CertErrorParams> CreateCertErrorParams2Der( |
const der::Input& der1, |
const char* name2, |
const der::Input& der2) { |
+ DCHECK(name1); |
+ DCHECK(name2); |
return base::MakeUnique<CertErrorParams2Der>(name1, der1, name2, der2); |
} |
std::unique_ptr<CertErrorParams> CreateCertErrorParamsSizeT(const char* name, |
size_t value) { |
+ DCHECK(name); |
return base::MakeUnique<CertErrorParamsSizeT>(name, value); |
} |
+NET_EXPORT std::unique_ptr<CertErrorParams> CreateCertErrorParamsSizeT( |
+ const char* name1, |
+ size_t value1, |
+ const char* name2, |
+ size_t value2) { |
+ DCHECK(name1); |
+ DCHECK(name2); |
+ return base::MakeUnique<CertErrorParams2SizeT>(name1, value1, name2, value2); |
+} |
+ |
} // namespace net |