Revert of Embed address normalization rewriting rules.

components/autofill/core/browser/autofill_profile_comparator.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_COMPARATOR_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_COMPARATOR_H_
 
 #include <memory>
 #include <set>
 
@@ skipping 182 matching lines @@
   // Returns true if |p1| and |p2| have addresses which are equivalent for the
   // purposes of merging the two profiles. This means one of the addresses is
   // empty, or the addresses are a match. A number of normalization and
   // comparison heuristics are employed to determine if the addresses match.
   //
   // Note that this method does not provide any guidance on actually merging
   // the email addresses.
   bool HaveMergeableAddresses(const AutofillProfile& p1,
                               const AutofillProfile& p2) const;
 
+  // Returns true if |state1| and |state2| both represent the same state in
+  // |country_code|.
+  bool IsMatchingState(const base::string16& country_code,
+                       const base::string16& state1,
+                       const base::string16& state2) const;
+
  private:
   l10n::CaseInsensitiveCompare case_insensitive_compare_;
   std::unique_ptr<icu::Transliterator> transliterator_;
   const std::string app_locale_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillProfileComparator);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_PROFILE_COMPARATOR_H_