Revert "Send only 1 event from AutofillPrivate to the JS"

This reverts commit 197a1362.

Reason for revert: Unable to add card entries under chrome://settings/payments

Original change's description:
> Send only 1 event from AutofillPrivate to the JS
> 
> OnAddressListChanged, OnCreditCardsChanged
> Instead it should have a single OnPersonalDataChanged call
> 
> Bug: 923868
> Change-Id: Ie6bc51cf71f82228df32db551489bf66168a54e6
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1631451
> Commit-Queue: sebsg <sebsg@chromium.org>
> Reviewed-by: sebsg <sebsg@chromium.org>
> Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
> Auto-Submit: Jaeyong Bae <jdragon.bae@gmail.com>
> Cr-Commit-Position: refs/heads/master@{#664246}

TBR=stevenjb@chromium.org,sebsg@chromium.org,jdragon.bae@gmail.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 923868, 968426
Change-Id: Idfcee169a82c3836b70173d8669b29a45cd47c5e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1643408Reviewed-by: sebsg <sebsg@chromium.org>
Commit-Queue: sebsg <sebsg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665894}

chrome/browser/extensions/api/autofill_private/autofill_private_event_router.cc

@@ -50,6 +50,7 @@ void AutofillPrivateEventRouter::Shutdown() {
     personal_data_->RemoveObserver(this);
 }
 
+// TODO(crbug.com/923868): Change the 2 calls to a single OnPersonalDataChanged.
 void AutofillPrivateEventRouter::OnPersonalDataChanged() {
   // Ignore any updates before data is loaded. This can happen in tests.
   if (!(personal_data_ && personal_data_->IsDataLoaded()))
@@ -57,19 +58,24 @@ void AutofillPrivateEventRouter::OnPersonalDataChanged() {
 
   autofill_util::AddressEntryList addressList =
       extensions::autofill_util::GenerateAddressList(*personal_data_);
-
-  autofill_util::CreditCardEntryList creditCardList =
-      extensions::autofill_util::GenerateCreditCardList(*personal_data_);
-
   std::unique_ptr<base::ListValue> args(
-      api::autofill_private::OnPersonalDataChanged::Create(addressList, creditCardList)
+      api::autofill_private::OnAddressListChanged::Create(addressList)
           .release());
-
   std::unique_ptr<Event> extension_event(
-      new Event(events::AUTOFILL_PRIVATE_ON_PERSONAL_DATA_CHANGED,
-                api::autofill_private::OnPersonalDataChanged::kEventName,
+      new Event(events::AUTOFILL_PRIVATE_ON_ADDRESS_LIST_CHANGED,
+                api::autofill_private::OnAddressListChanged::kEventName,
                 std::move(args)));
+  event_router_->BroadcastEvent(std::move(extension_event));
 
+  autofill_util::CreditCardEntryList creditCardList =
+      extensions::autofill_util::GenerateCreditCardList(*personal_data_);
+  args.reset(
+      api::autofill_private::OnCreditCardListChanged::Create(creditCardList)
+          .release());
+  extension_event.reset(
+      new Event(events::AUTOFILL_PRIVATE_ON_CREDIT_CARD_LIST_CHANGED,
+                api::autofill_private::OnCreditCardListChanged::kEventName,
+                std::move(args)));
   event_router_->BroadcastEvent(std::move(extension_event));
 }
 

chrome/browser/resources/settings/autofill_page/autofill_section.js

@@ -50,12 +50,12 @@ AutofillManager.AddressEntry;
 class AutofillManagerImpl {
   /** @override */
   addAddressListChangedListener(listener) {
-    chrome.autofillPrivate.onPersonalDataChanged.addListener(listener);
+    chrome.autofillPrivate.onAddressListChanged.addListener(listener);
   }
 
   /** @override */
   removeAddressListChangedListener(listener) {
-    chrome.autofillPrivate.onPersonalDataChanged.removeListener(listener);
+    chrome.autofillPrivate.onAddressListChanged.removeListener(listener);
   }
 
   /** @override */

chrome/browser/resources/settings/autofill_page/payments_section.js

@@ -63,12 +63,12 @@ PaymentsManager.CreditCardEntry;
 class PaymentsManagerImpl {
   /** @override */
   addCreditCardListChangedListener(listener) {
-    chrome.autofillPrivate.onPersonalDataChanged.addListener(listener);
+    chrome.autofillPrivate.onCreditCardListChanged.addListener(listener);
   }
 
   /** @override */
   removeCreditCardListChangedListener(listener) {
-    chrome.autofillPrivate.onPersonalDataChanged.removeListener(listener);
+    chrome.autofillPrivate.onCreditCardListChanged.removeListener(listener);
   }
 
   /** @override */

chrome/common/extensions/api/autofill_private.idl

@@ -242,9 +242,14 @@ namespace autofillPrivate {
   };
 
   interface Events {
-    // Fired when the personal data has changed, meaning that an entry has
+    // Fired when the address list has changed, meaning that an entry has been
+    // added, removed, or changed.
+    // |entries| The updated list of entries.
+    static void onAddressListChanged(AddressEntry[] entries);
+
+    // Fired when the credit card list has changed, meaning that an entry has
     // been added, removed, or changed.
     // |entries| The updated list of entries.
-    static void onPersonalDataChanged(AddressEntry[] addressEntries, CreditCardEntry[] creditCardEntries);
+    static void onCreditCardListChanged(CreditCardEntry[] entries);
   };
 };

chrome/test/data/extensions/api_test/autofill_private/test.js

@@ -97,8 +97,8 @@ var availableTests = [
           // Setup the callback that verifies that the address was correctly
           // added.
           chrome.test.listenOnce(
-              chrome.autofillPrivate.onPersonalDataChanged,
-              chrome.test.callbackPass(function(addressList, cardList) {
+              chrome.autofillPrivate.onAddressListChanged,
+              chrome.test.callbackPass(function(addressList) {
                 chrome.test.assertEq(
                     [{
                       fullNames: [NAME],
@@ -154,8 +154,8 @@ var availableTests = [
           // Setup the callback that verifies that the address was correctly
           // updated.
           chrome.test.listenOnce(
-              chrome.autofillPrivate.onPersonalDataChanged,
-              chrome.test.callbackPass(function(addressList, cardList) {
+              chrome.autofillPrivate.onAddressListChanged,
+              chrome.test.callbackPass(function(addressList) {
                 chrome.test.assertEq(
                     [{
                       guid: addressGuid,
@@ -199,8 +199,8 @@ var availableTests = [
 
           // Setup the callback that verifies that the card was correctly added.
           chrome.test.listenOnce(
-              chrome.autofillPrivate.onPersonalDataChanged,
-              chrome.test.callbackPass(function(addressList, cardList) {
+              chrome.autofillPrivate.onCreditCardListChanged,
+              chrome.test.callbackPass(function(cardList) {
                 chrome.test.assertEq(
                     [{
                       name: CARD_NAME,
@@ -244,8 +244,8 @@ var availableTests = [
           // Setup the callback that verifies that the address was correctly
           // updated.
           chrome.test.listenOnce(
-              chrome.autofillPrivate.onPersonalDataChanged,
-              chrome.test.callbackPass(function(addressList, cardList) {
+              chrome.autofillPrivate.onCreditCardListChanged,
+              chrome.test.callbackPass(function(cardList) {
                 chrome.test.assertEq(
                     [{
                       guid: cardGuid,
@@ -289,7 +289,7 @@ var availableTests = [
       }
     }
 
-    chrome.autofillPrivate.onPersonalDataChanged.addListener(handler);
+    chrome.autofillPrivate.onCreditCardListChanged.addListener(handler);
     chrome.autofillPrivate.getCreditCardList(handler);
     chrome.autofillPrivate.saveCreditCard({name: NAME});
   },

extensions/browser/extension_event_histogram_value.h

@@ -46,8 +46,8 @@ enum HistogramValue {
   AUDIO_ON_DEVICES_CHANGED = 25,
   AUDIO_ON_LEVEL_CHANGED = 26,
   AUDIO_ON_MUTE_CHANGED = 27,
-  AUTOFILL_PRIVATE_ON_ADDRESS_LIST_CHANGED_DEPRECATED = 28,
-  AUTOFILL_PRIVATE_ON_CREDIT_CARD_LIST_CHANGED_DEPRECATED = 29,
+  AUTOFILL_PRIVATE_ON_ADDRESS_LIST_CHANGED = 28,
+  AUTOFILL_PRIVATE_ON_CREDIT_CARD_LIST_CHANGED = 29,
   AUTOMATION_INTERNAL_ON_ACCESSIBILITY_EVENT = 30,
   AUTOMATION_INTERNAL_ON_ACCESSIBILITY_TREE_DESTROYED = 31,
   BLUETOOTH_LOW_ENERGY_ON_CHARACTERISTIC_VALUE_CHANGED = 32,
@@ -457,7 +457,6 @@ enum HistogramValue {
   MIME_HANDLER_PRIVATE_SAVE = 436,
   RUNTIME_ON_CONNECT_NATIVE = 437,
   ACTION_ON_CLICKED = 438,
-  AUTOFILL_PRIVATE_ON_PERSONAL_DATA_CHANGED = 439,
   // Last entry: Add new entries above, then run:
   // python tools/metrics/histograms/update_extension_histograms.py
   ENUM_BOUNDARY

third_party/closure_compiler/externs/autofill_private.js

@@ -197,8 +197,15 @@ chrome.autofillPrivate.migrateCreditCards = function() {};
 chrome.autofillPrivate.logServerCardLinkClicked = function() {};
 
 /**
- * Fired when the perosnal data has changed, meaning that an entry has been
+ * Fired when the address list has changed, meaning that an entry has been
  * added, removed, or changed. |entries| The updated list of entries.
  * @type {!ChromeEvent}
  */
-chrome.autofillPrivate.onPersonalDataChanged;
+chrome.autofillPrivate.onAddressListChanged;
+
+/**
+ * Fired when the credit card list has changed, meaning that an entry has been
+ * added, removed, or changed. |entries| The updated list of entries.
+ * @type {!ChromeEvent}
+ */
+chrome.autofillPrivate.onCreditCardListChanged;

tools/metrics/histograms/enums.xml

@@ -17717,9 +17717,8 @@ Called by update_net_error_codes.py.-->
   <int value="25" label="AUDIO_ON_DEVICES_CHANGED"/>
   <int value="26" label="AUDIO_ON_LEVEL_CHANGED"/>
   <int value="27" label="AUDIO_ON_MUTE_CHANGED"/>
-  <int value="28" label="AUTOFILL_PRIVATE_ON_ADDRESS_LIST_CHANGED_DEPRECATED"/>
-  <int value="29"
-      label="AUTOFILL_PRIVATE_ON_CREDIT_CARD_LIST_CHANGED_DEPRECATED"/>
+  <int value="28" label="AUTOFILL_PRIVATE_ON_ADDRESS_LIST_CHANGED"/>
+  <int value="29" label="AUTOFILL_PRIVATE_ON_CREDIT_CARD_LIST_CHANGED"/>
   <int value="30" label="AUTOMATION_INTERNAL_ON_ACCESSIBILITY_EVENT"/>
   <int value="31" label="AUTOMATION_INTERNAL_ON_ACCESSIBILITY_TREE_DESTROYED"/>
   <int value="32" label="BLUETOOTH_LOW_ENERGY_ON_CHARACTERISTIC_VALUE_CHANGED"/>
@@ -18145,7 +18144,6 @@ Called by update_net_error_codes.py.-->
   <int value="436" label="MIME_HANDLER_PRIVATE_SAVE"/>
   <int value="437" label="RUNTIME_ON_CONNECT_NATIVE"/>
   <int value="438" label="ACTION_ON_CLICKED"/>
-  <int value="439" label="AUTOFILL_PRIVATE_ON_PERSONAL_DATA_CHANGED"/>
 </enum>
 
 <enum name="ExtensionFileWriteResult">