Add a new enum value to indicate user action on settings

Introduce a new enum value to GaiaPasswordReuse::
PasswordReuseDialogInteraction to indicate user's clicked on change
password card on chrome://settings page.

Server side proto change landed in cl/212475859

Also remove user action logging on page info bubble, since they're
seldom used.

Bug: 882964
Change-Id: Id3492181efcbf862f7655438dad087922a91dc3d
Reviewed-on: https://chromium-review.googlesource.com/1220558Reviewed-by: Marc Treib <treib@chromium.org>
Reviewed-by: Daniel Rubery <drubery@chromium.org>
Commit-Queue: Jialiu Lin <jialiul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#591372}

chrome/browser/safe_browsing/chrome_password_protection_service.cc

@@ -1064,9 +1064,6 @@ void ChromePasswordProtectionService::HandleUserActionOnPageInfo(
   const Origin origin = Origin::Create(url);
 
   if (action == WarningAction::CHANGE_PASSWORD) {
-    MaybeLogPasswordReuseDialogInteraction(
-        GetNavigationIDFromPrefsByOrigin(profile_->GetPrefs(), origin),
-        PasswordReuseDialogInteraction::WARNING_ACTION_TAKEN);
     // Directly open enterprise change password page in a new tab for enterprise
     // reuses.
     if (password_type == PasswordReuseEvent::ENTERPRISE_PASSWORD) {
@@ -1117,7 +1114,7 @@ void ChromePasswordProtectionService::HandleUserActionOnSettings(
   // event the user is responding to, so just pick the first one.
   MaybeLogPasswordReuseDialogInteraction(
       GetFirstNavIdOrZero(profile_->GetPrefs()),
-      PasswordReuseDialogInteraction::WARNING_ACTION_TAKEN);
+      PasswordReuseDialogInteraction::WARNING_ACTION_TAKEN_ON_SETTINGS);
   // Opens change password page in a new tab for user to change password.
   OpenUrl(web_contents, GetDefaultChangePasswordURL(),
           content::Referrer(web_contents->GetLastCommittedURL(),

components/safe_browsing/password_protection/password_protection_request.cc

@@ -184,10 +184,10 @@ void PasswordProtectionRequest::FillRequestProto() {
           reused_password_type_ ==
           LoginReputationClientRequest::PasswordReuseEvent::SIGN_IN_PASSWORD;
       reuse_event->set_is_chrome_signin_password(matches_sync_password);
+      reuse_event->set_reused_password_type(reused_password_type_);
       if (matches_sync_password) {
         reuse_event->set_sync_account_type(
             password_protection_service_->GetSyncAccountType());
-        reuse_event->set_reused_password_type(reused_password_type_);
         LogSyncAccountType(reuse_event->sync_account_type());
       }
       if (password_protection_service_->IsExtendedReporting() &&

components/safe_browsing/web_ui/safe_browsing_ui.cc

@@ -675,6 +675,9 @@ base::DictionaryValue SerializePGEvent(
       case PasswordReuseDialogInteraction::WARNING_UI_IGNORED:
         interaction_result = "WARNING_UI_IGNORED";
         break;
+      case PasswordReuseDialogInteraction::WARNING_ACTION_TAKEN_ON_SETTINGS:
+        interaction_result = "WARNING_ACTION_TAKEN_ON_SETTINGS";
+        break;
     }
     event_dict.SetPath({"dialog_interaction", "interaction_result"},
                        base::Value(interaction_result));

components/sync/protocol/proto_enum_conversions.cc

@@ -397,7 +397,8 @@ const char* ProtoEnumToString(
         PasswordReuseDialogInteraction::InteractionResult interaction_result) {
   ASSERT_ENUM_BOUNDS(sync_pb::UserEventSpecifics::GaiaPasswordReuse::
                          PasswordReuseDialogInteraction,
-                     InteractionResult, UNSPECIFIED, WARNING_UI_IGNORED);
+                     InteractionResult, UNSPECIFIED,
+                     WARNING_ACTION_TAKEN_ON_SETTINGS);
   switch (interaction_result) {
     ENUM_CASE(sync_pb::UserEventSpecifics::GaiaPasswordReuse::
                   PasswordReuseDialogInteraction,
@@ -411,6 +412,9 @@ const char* ProtoEnumToString(
     ENUM_CASE(sync_pb::UserEventSpecifics::GaiaPasswordReuse::
                   PasswordReuseDialogInteraction,
               WARNING_UI_IGNORED);
+    ENUM_CASE(sync_pb::UserEventSpecifics::GaiaPasswordReuse::
+                  PasswordReuseDialogInteraction,
+              WARNING_ACTION_TAKEN_ON_SETTINGS);
   }
   NOTREACHED();
   return "";

components/sync/protocol/user_event_specifics.proto

@@ -241,7 +241,7 @@ message UserEventSpecifics {
     // Phishing or a Low-reputation site.
     optional PasswordReuseLookup reuse_lookup = 2;
 
-    // Logged when the user interacts with the dialog shown to encourage
+    // Logged when the user interacts with the warning UI shown to encourage
     // password change if the site is Phishing or Low-reputation.
     message PasswordReuseDialogInteraction {
       enum InteractionResult {
@@ -253,6 +253,8 @@ message UserEventSpecifics {
         // The warning UI was ignored, i.e. not interacted with by the user.
         // This could happen if the user navigates away from the page.
         WARNING_UI_IGNORED = 3;
+        // The user clicked "Change Password" on chrome://settings page.
+        WARNING_ACTION_TAKEN_ON_SETTINGS = 4;
       }
       optional InteractionResult interaction_result = 1;
     }