Add sync settings to IsCreditCardUploadEnabled.

The check for whether Autofill sync is available matches that in autofill::WalletIntegrationAvailable and should have been in the original implementation of this method. Upload should only be available for clients with sync and for users who include Autofill in their chosen sync types.

The second check covers a privacy requirement that we not offer upload to users who have set a passphrase.

BUG=535784

Review URL: https://codereview.chromium.org/1578953005

Cr-Commit-Position: refs/heads/master@{#369763}

2 files changed, 9 insertions, 0 deletions

diff --git a/android_webview/native/aw_autofill_client.cc b/android_webview/native/aw_autofill_client.cc
index 6d84526..b72eb14 100644
--- a/android_webview/native/aw_autofill_client.cc
+++ b/android_webview/native/aw_autofill_client.cc
@@ -68,6 +68,10 @@ PrefService* AwAutofillClient::GetPrefs() {
       AwContentBrowserClient::GetAwBrowserContext());
 }
 
+sync_driver::SyncService* AwAutofillClient::GetSyncService() {
+  return nullptr;
+}
+
 IdentityProvider* AwAutofillClient::GetIdentityProvider() {
   return nullptr;
 }
diff --git a/android_webview/native/aw_autofill_client.h b/android_webview/native/aw_autofill_client.h
index 52cd4b1..78cfa96 100644
--- a/android_webview/native/aw_autofill_client.h
+++ b/android_webview/native/aw_autofill_client.h
@@ -35,6 +35,10 @@ namespace gfx {
 class RectF;
 }
 
+namespace sync_driver {
+class SyncService;
+}
+
 class PersonalDataManager;
 class PrefService;
 
@@ -59,6 +63,7 @@ class AwAutofillClient : public autofill::AutofillClient,
   autofill::PersonalDataManager* GetPersonalDataManager() override;
   scoped_refptr<autofill::AutofillWebDataService> GetDatabase() override;
   PrefService* GetPrefs() override;
+  sync_driver::SyncService* GetSyncService() override;
   IdentityProvider* GetIdentityProvider() override;
   rappor::RapporService* GetRapporService() override;
   void HideRequestAutocompleteDialog() override;