[PR] Removes GetURLRequestContextGetter from autofill::PersonalDataManager

Replaces usages of PersonalDataManager::GetURLRequestContextGetter() with
ApplicationContext::GetSystemURLRequestContext()

Bug: 781942
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I7e42baf9ce61d722410c1f49ee33a55c5e53485a
Reviewed-on: https://chromium-review.googlesource.com/793850
Commit-Queue: Moe Ahmadi <mahmadi@chromium.org>
Reviewed-by: Mathieu Perreault <mathp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#519825}

components/autofill/core/browser/autofill_manager.cc

@@ -1212,9 +1212,6 @@ AutofillManager::AutofillManager(
   CountryNames::SetLocaleString(app_locale_);
   if (personal_data_ && client_)
     personal_data_->OnSyncServiceInitialized(client_->GetSyncService());
-
-  if (personal_data_ && driver)
-    personal_data_->SetURLRequestContextGetter(driver->GetURLRequestContext());
 }
 
 bool AutofillManager::RefreshDataModels() {

components/autofill/core/browser/personal_data_manager.h

@@ -28,7 +28,6 @@
 #include "components/prefs/pref_change_registrar.h"
 #include "components/prefs/pref_member.h"
 #include "components/webdata/common/web_data_service_consumer.h"
-#include "net/url_request/url_request_context_getter.h"
 
 class AccountTrackerService;
 class Browser;
@@ -285,18 +284,6 @@ class PersonalDataManager : public KeyedService,
   // Notifies test observers that personal data has changed.
   void NotifyPersonalDataChangedForTest() { NotifyPersonalDataChanged(); }
 
-  // Sets the URL request context getter to be used when normalizing addresses
-  // with libaddressinput's address validator.
-  void SetURLRequestContextGetter(
-      net::URLRequestContextGetter* context_getter) {
-    context_getter_ = context_getter;
-  }
-
-  // Returns the class used to fetch the address validation rules.
-  net::URLRequestContextGetter* GetURLRequestContextGetter() const {
-    return context_getter_.get();
-  }
-
   // This function assumes |credit_card| contains the full PAN. Returns |true|
   // if the card number of |credit_card| is equal to any local card or any
   // unmasked server card known by the browser, or |TypeAndLastFourDigits| of
@@ -627,10 +614,6 @@ class PersonalDataManager : public KeyedService,
   bool has_created_test_addresses_ = false;
   bool has_created_test_credit_cards_ = false;
 
-  // The context for the request to be used to fetch libaddressinput's address
-  // validation rules.
-  scoped_refptr<net::URLRequestContextGetter> context_getter_;
-
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManager);
 };
 

ios/chrome/browser/payments/payment_request.mm

@@ -89,9 +89,10 @@ PaymentRequest::PaymentRequest(
       web_state_(web_state),
       personal_data_manager_(personal_data_manager),
       payment_request_ui_delegate_(payment_request_ui_delegate),
+      // TODO(crbug.com/788229): Use a factory for the AddressNormalizer.
       address_normalizer_(
           GetAddressInputSource(
-              personal_data_manager_->GetURLRequestContextGetter()),
+              GetApplicationContext()->GetSystemURLRequestContext()),
           GetAddressInputStorage(),
           GetApplicationContext()->GetApplicationLocale()),
       address_normalization_manager_(
@@ -105,7 +106,7 @@ PaymentRequest::PaymentRequest(
       journey_logger_(IsIncognito(), GetLastCommittedURL(), GetUkmRecorder()),
       payment_instruments_ready_(false),
       ios_instrument_finder_(
-          personal_data_manager_->GetURLRequestContextGetter(),
+          GetApplicationContext()->GetSystemURLRequestContext(),
           payment_request_ui_delegate_) {
   PopulateAvailableShippingOptions();
   PopulateProfileCache();
@@ -184,7 +185,7 @@ autofill::AddressNormalizer* PaymentRequest::GetAddressNormalizer() {
 autofill::RegionDataLoader* PaymentRequest::GetRegionDataLoader() {
   return new autofill::RegionDataLoaderImpl(
       GetAddressInputSource(
-          personal_data_manager_->GetURLRequestContextGetter())
+          GetApplicationContext()->GetSystemURLRequestContext())
           .release(),
       GetAddressInputStorage().release(), GetApplicationLocale());
 }