Revert of Parse HPKP report-uri and persist in TransportSecurityPersister

net/http/http_util.h

Index: net/http/http_util.h
diff --git a/net/http/http_util.h b/net/http/http_util.h
index 1bb3c93f8ab168152dc75205e00aabcc0d9c30cf..79a41acd193cccddc4152fabb50e0760ba06b385 100644
--- a/net/http/http_util.h
+++ b/net/http/http_util.h
@@ -28,6 +28,14 @@
   // made up of the protocol, host, [port], path, [query]. Everything else
   // is stripped (username, password, reference).
   static std::string SpecForRequest(const GURL& url);
+
+  // Locates the next occurance of delimiter in line, skipping over quoted
+  // strings (e.g., commas will not be treated as delimiters if they appear
+  // within a quoted string).  Returns the offset of the found delimiter or
+  // line.size() if no delimiter was found.
+  static size_t FindDelimiter(const std::string& line,
+                              size_t search_start,
+                              char delimiter);
 
   // Parses the value of a Content-Type header.  The resulting mime_type and
   // charset values are normalized to lowercase.  The mime_type and charset
@@ -315,22 +323,9 @@
   // calls to GetNext() or after the NameValuePairsIterator is destroyed.
   class NET_EXPORT NameValuePairsIterator {
    public:
-    // Whether or not values are optional. VALUES_OPTIONAL allows
-    // e.g. name1=value1;name2;name3=value3, whereas VALUES_NOT_OPTIONAL
-    // will treat it as a parse error because name2 does not have a
-    // corresponding equals sign.
-    enum OptionalValues { VALUES_OPTIONAL, VALUES_NOT_OPTIONAL };
-
-    NameValuePairsIterator(std::string::const_iterator begin,
-                           std::string::const_iterator end,
-                           char delimiter,
-                           OptionalValues optional_values);
-
-    // Treats values as not optional by default (VALUES_NOT_OPTIONAL).
     NameValuePairsIterator(std::string::const_iterator begin,
                            std::string::const_iterator end,
                            char delimiter);
-
     ~NameValuePairsIterator();
 
     // Advances the iterator to the next pair, if any.  Returns true if there
@@ -358,8 +353,6 @@
                                                               value_end_);
     }
 
-    bool value_is_quoted() const { return value_is_quoted_; }
-
     // The value before unquoting (if any).
     std::string raw_value() const { return std::string(value_begin_,
                                                        value_end_); }
@@ -380,10 +373,6 @@
     std::string unquoted_value_;
 
     bool value_is_quoted_;
-
-    // True if values are required for each name/value pair; false if a
-    // name is permitted to appear without a corresponding value.
-    bool values_optional_;
   };
 };