Revert of [Payments] Normalize Shipping Address sent to merchant on Desktop.

components/autofill/core/browser/autofill_data_util.cc

 // Copyright 2016 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/autofill/core/browser/autofill_data_util.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/i18n/char_iterator.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/grit/components_scaled_resources.h"
 #include "third_party/icu/source/common/unicode/uscript.h"
-#include "third_party/re2/src/re2/re2.h"
 
 namespace autofill {
 namespace data_util {
 
 namespace {
 // Mappings from Chrome card types to Payment Request API basic card payment
 // spec types and icons. Note that "generic" is not in the spec.
 // https://w3c.github.io/webpayments-methods-card/#method-id
 const PaymentRequestData kPaymentRequestData[]{
     {"americanExpressCC", "amex", IDR_AUTOFILL_PR_AMEX},
@@ skipping 385 matching lines @@
 const char* GetCardTypeForBasicCardPaymentType(
     const std::string& basic_card_payment_type) {
   for (const PaymentRequestData& data : kPaymentRequestData) {
     if (basic_card_payment_type == data.basic_card_payment_type) {
       return data.card_type;
     }
   }
   return kGenericPaymentRequestData.card_type;
 }
 
-bool IsValidCountryCode(const std::string& country_code) {
-  if (country_code.size() != 2)
-    return false;
-
-  return re2::RE2::FullMatch(country_code, "^[A-Z]{2}$");
-}
-
-bool IsValidCountryCode(const base::string16& country_code) {
-  return IsValidCountryCode(base::UTF16ToUTF8(country_code));
-}
-
 }  // namespace data_util
 }  // namespace autofill