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

components/payments/core/address_normalizer.h

 // Copyright 2017 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_PAYMENTS_CORE_ADDRESS_NORMALIZER_H_
 #define COMPONENTS_PAYMENTS_CORE_ADDRESS_NORMALIZER_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 40 matching lines @@
 
   AddressNormalizer(std::unique_ptr<::i18n::addressinput::Source> source,
                     std::unique_ptr<::i18n::addressinput::Storage> storage);
   ~AddressNormalizer() override;
 
   // Start loading the validation rules for the specified |region_code|.
   virtual void LoadRulesForRegion(const std::string& region_code);
 
   // Returns whether the rules for the specified |region_code| have finished
   // loading.
-  virtual bool AreRulesLoadedForRegion(const std::string& region_code);
+  bool AreRulesLoadedForRegion(const std::string& region_code);
 
   // Starts the normalization of the |profile| based on the |region_code|. The
   // normalized profile will be returned to the |requester| possibly
   // asynchronously. If the normalization is not completed in |timeout_seconds|
   // the requester will be informed and the request cancelled. This value should
   // be greater or equal to 0, for which it means that the normalization should
   // happen synchronously, or not at all if the rules are not already loaded.
   // Will start loading the rules for the |region_code| if they had not started
   // loading.
-  virtual void StartAddressNormalization(
-      const autofill::AutofillProfile& profile,
-      const std::string& region_code,
-      int timeout_seconds,
-      Delegate* requester);
+  void StartAddressNormalization(const autofill::AutofillProfile& profile,
+                                 const std::string& region_code,
+                                 int timeout_seconds,
+                                 Delegate* requester);
 
  private:
   // Called when the validation rules for the |region_code| have finished
   // loading. Implementation of the LoadRulesListener interface.
   void OnAddressValidationRulesLoaded(const std::string& region_code,
                                       bool success) override;
 
   // Map associating a region code to pending normalizations.
   std::map<std::string, std::vector<std::unique_ptr<Request>>>
       pending_normalization_;
 
   // The address validator used to normalize addresses.
   autofill::AddressValidator address_validator_;
 
   DISALLOW_COPY_AND_ASSIGN(AddressNormalizer);
 };
 
 }  // namespace payments
 
 #endif  // COMPONENTS_PAYMENTS_CORE_ADDRESS_NORMALIZER_H_