| Index: chromeos/network/certificate_pattern.h
|
| diff --git a/chromeos/network/certificate_pattern.h b/chromeos/network/certificate_pattern.h
|
| index 5a579103777410870f658173b75b6a8083767572..9db54469d8ec157b9e6c8ce7dc153bf2c65fe71c 100644
|
| --- a/chromeos/network/certificate_pattern.h
|
| +++ b/chromeos/network/certificate_pattern.h
|
| @@ -31,7 +31,7 @@ class CHROMEOS_EXPORT IssuerSubjectPattern {
|
| // Returns true if all fields in the pattern are empty.
|
| bool Empty() const;
|
|
|
| - // Clears out all values in this pattern (so Empty returns true).
|
| + // Clears out all values in this pattern.
|
| void Clear();
|
|
|
| void set_common_name(const std::string& name) { common_name_ = name; }
|
| @@ -56,9 +56,6 @@ class CHROMEOS_EXPORT IssuerSubjectPattern {
|
| return organizational_unit_;
|
| }
|
|
|
| - // Creates a new dictionary containing the data in this pattern.
|
| - scoped_ptr<base::DictionaryValue> CreateONCDictionary() const;
|
| -
|
| // Replaces the content of this object with the values of |dictionary|.
|
| // |dictionary| should be a valid ONC IssuerSubjectPattern dictionary.
|
| void ReadFromONCDictionary(const base::DictionaryValue& dictionary);
|
| @@ -81,9 +78,6 @@ class CHROMEOS_EXPORT CertificatePattern {
|
| // all certs). Ignores enrollment_uri_;
|
| bool Empty() const;
|
|
|
| - // Clears out all the values in this pattern (so Empty returns true).
|
| - void Clear();
|
| -
|
| void set_issuer(const IssuerSubjectPattern& issuer) { issuer_ = issuer; }
|
| void set_subject(const IssuerSubjectPattern& subject) { subject_ = subject; }
|
| void set_enrollment_uri_list(const std::vector<std::string>& uri_list) {
|
| @@ -103,15 +97,15 @@ class CHROMEOS_EXPORT CertificatePattern {
|
| return enrollment_uri_list_;
|
| }
|
|
|
| - // Creates a new dictionary containing the data in the certificate pattern.
|
| - scoped_ptr<base::DictionaryValue> CreateONCDictionary() const;
|
| -
|
| // Replaces the content of this object with the values of |dictionary|.
|
| // |dictionary| should be a valid ONC CertificatePattern dictionary. Returns
|
| // whether all required fields were present.
|
| bool ReadFromONCDictionary(const base::DictionaryValue& dictionary);
|
|
|
| private:
|
| + // Clears out all the values in this pattern.
|
| + void Clear();
|
| +
|
| std::vector<std::string> issuer_ca_pems_;
|
| IssuerSubjectPattern issuer_;
|
| IssuerSubjectPattern subject_;
|
|
|