Share link header parsing code between blink and content.

components/gcm_driver/crypto/encryption_header_parsers.cc

 // Copyright 2015 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.
 
 #include "components/gcm_driver/crypto/encryption_header_parsers.h"
 
 #include "base/base64url.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
@@ skipping 57 matching lines @@
 // This means that the three supported parameters are:
 //
 //     [ "keyid" "=" string ]
 //     [ ";" "salt" "=" base64url ]
 //     [ ";" "rs" "=" octet-count ]
 bool ParseEncryptionHeaderValuesImpl(std::string::const_iterator input_begin,
                                      std::string::const_iterator input_end,
                                      EncryptionHeaderValues* values) {
   net::HttpUtil::NameValuePairsIterator name_value_pairs(
       input_begin, input_end, ';',
-      net::HttpUtil::NameValuePairsIterator::VALUES_NOT_OPTIONAL);
+      net::HttpUtil::NameValuePairsIterator::Values::REQUIRED,
+      net::HttpUtil::NameValuePairsIterator::Quotes::NOT_STRICT);
 
   while (name_value_pairs.GetNext()) {
     const base::StringPiece name(name_value_pairs.name_begin(),
                                  name_value_pairs.name_end());
 
     if (base::LowerCaseEqualsASCII(name, "keyid")) {
       values->keyid.assign(name_value_pairs.value_begin(),
                            name_value_pairs.value_end());
     } else if (base::LowerCaseEqualsASCII(name, "salt")) {
       if (!ValueToDecodedString(name_value_pairs.value_begin(),
@@ skipping 27 matching lines @@
 // This means that the three supported parameters are:
 //
 //     [ "keyid" "=" string ]
 //     [ ";" "aesgcm128" "=" base64url ]
 //     [ ";" "dh" "=" base64url ]
 bool ParseCryptoKeyHeaderValuesImpl(std::string::const_iterator input_begin,
                                     std::string::const_iterator input_end,
                                     CryptoKeyHeaderValues* values) {
   net::HttpUtil::NameValuePairsIterator name_value_pairs(
       input_begin, input_end, ';',
-      net::HttpUtil::NameValuePairsIterator::VALUES_NOT_OPTIONAL);
+      net::HttpUtil::NameValuePairsIterator::Values::REQUIRED,
+      net::HttpUtil::NameValuePairsIterator::Quotes::NOT_STRICT);
 
   while (name_value_pairs.GetNext()) {
     const base::StringPiece name(name_value_pairs.name_begin(),
                                  name_value_pairs.name_end());
 
     if (base::LowerCaseEqualsASCII(name, "keyid")) {
       values->keyid.assign(name_value_pairs.value_begin(),
                            name_value_pairs.value_end());
     } else if (base::LowerCaseEqualsASCII(name, "aesgcm128")) {
       if (!ValueToDecodedString(name_value_pairs.value_begin(),
@@ skipping 56 matching lines @@
     }
 
     candidate_values.push_back(candidate_value);
   }
 
   values->swap(candidate_values);
   return true;
 }
 
 }  // namespace gcm