If upload is enabled don't fallback to local save.

components/autofill/core/browser/autofill_manager.cc

 // Copyright 2013 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_manager.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 867 matching lines @@
     // credentials until the user has explicitly accepted a prompt to upload.
     upload_request_.context_token = context_token;
     user_did_accept_upload_prompt_ = false;
     client_->ConfirmSaveCreditCardToCloud(
         base::Bind(&AutofillManager::OnUserDidAcceptUpload,
                    weak_ptr_factory_.GetWeakPtr()),
         legal_message.Pass());
     client_->LoadRiskData(base::Bind(&AutofillManager::OnDidGetUploadRiskData,
                                      weak_ptr_factory_.GetWeakPtr()));
   } else {
-    // Since the upload details request failed, fallback to a local save.
+    // If the upload details request failed, fall back to a local save. The
+    // reasoning here is as follows:
+    // - This will sometimes fail intermittently, in which case it might be
+    // better to not fall back, because sometimes offering upload and sometimes
+    // offering local save is a poor user experience.
+    // - However, in some cases, our local configuration limiting the feature to
+    // countries that Payments is known to support will not match Payments' own
+    // determination of what country the user is located in. In these cases,
+    // the upload details request will consistently fail and if we don't fall
+    // back to a local save then the user will never be offered any kind of
+    // credit card save.
     client_->ConfirmSaveCreditCardLocally(base::Bind(
         base::IgnoreResult(&PersonalDataManager::SaveImportedCreditCard),
         base::Unretained(personal_data_), upload_request_.card));
   }
 }
 
 void AutofillManager::OnDidUploadCard(
     AutofillClient::PaymentsRpcResult result) {
   // We don't do anything user-visible if the upload attempt fails.
   // TODO(jdonnelly): Log duration.
@@ skipping 95 matching lines @@
         if (field->Type().GetStorableType() == CREDIT_CARD_VERIFICATION_CODE) {
           upload_request_.cvc = field->value;
           break;
         }
       }
 
       // Upload also requires recently used or modified profiles with matching
       // names.
       upload_request_.profiles =
           GetProfilesForCreditCardUpload(*imported_credit_card);
-    }
 
-    if (!upload_request_.cvc.empty() && !upload_request_.profiles.empty()) {
-      upload_request_.card = *imported_credit_card;
-      payments_client_->GetUploadDetails(app_locale_);
+      // If the necessary conditions don't exist, do nothing. We could fall back
+      // to a local save here but we believe that sometimes offering upload and
+      // sometimes offering local save is a confusing user experience.
+      if (!upload_request_.cvc.empty() && !upload_request_.profiles.empty()) {
+        upload_request_.card = *imported_credit_card;
+        payments_client_->GetUploadDetails(app_locale_);
+      }
     } else {
-      // If upload isn't enabled or not possible, prompt the user for local
-      // save.
       client_->ConfirmSaveCreditCardLocally(base::Bind(
           base::IgnoreResult(&PersonalDataManager::SaveImportedCreditCard),
           base::Unretained(personal_data_), *imported_credit_card));
     }
   }
 }
 
 std::vector<AutofillProfile> AutofillManager::GetProfilesForCreditCardUpload(
     const CreditCard& card) {
   std::vector<AutofillProfile> profiles;
@@ skipping 661 matching lines @@
     if (i > 0)
       fputs("Next oldest form:\n", file);
   }
   fputs("\n", file);
 
   fclose(file);
 }
 #endif  // ENABLE_FORM_DEBUG_DUMP
 
 }  // namespace autofill