[Password Generation] Update UMA stats for popups per page not per event.

components/autofill/core/common/password_generation_util.h

Index: components/autofill/core/common/password_generation_util.h
diff --git a/components/autofill/core/common/password_generation_util.h b/components/autofill/core/common/password_generation_util.h
index daf3c201e07f0ff65fb07b12ad923e0a4a954072..da64580ec7820ce565c602734fc6d79dcea991ec 100644
--- a/components/autofill/core/common/password_generation_util.h
+++ b/components/autofill/core/common/password_generation_util.h
@@ -29,13 +29,21 @@ enum PasswordGenerationEvent {
 
   // Password generation popup is shown after user focuses the appropriate
   // password field.
-  GENERATION_POPUP_SHOWN,
+  // DEPRECATED: These reports were triggered when the popup could have shown
+  // not when it did show so they paint an unreliable picture. Newer stats
+  // are only incremented per page, which is more useful to judge the
+  // effectiveness of the UI.
+  DEPRECATED_GENERATION_POPUP_SHOWN,
 
   // Generated password was accepted by the user.
   PASSWORD_ACCEPTED,
 
   // User focused the password field containing the generated password.
-  EDITING_POPUP_SHOWN,
+  // DEPRECATED: These reports were triggered when the popup could have shown
+  // not when it did show so they paint an unreliable picture. Newer stats
+  // are only incremented per page, which is more useful to judge the
+  // effectiveness of the UI.
+  DEPRECATED_EDITING_POPUP_SHOWN,
 
   // Password was changed after generation.
   PASSWORD_EDITED,
@@ -43,6 +51,13 @@ enum PasswordGenerationEvent {
   // Generated password was deleted by the user
   PASSWORD_DELETED,
 
+  // Password generation popup is shown after user focuses the appropriate
+  // password field.
+  GENERATION_POPUP_SHOWN,
+
+  // User focused the password field containing the generated password.
+  EDITING_POPUP_SHOWN,
+
   // Number of enum entries, used for UMA histogram reporting macros.
   EVENT_ENUM_COUNT
 };