Mark PASSWORD_ENTRY_ACTION_CANCELLED as obsolete

In PasswordEntryEditor, PASSWORD_ENTRY_ACTION_CANCELLED represented
the action of cancelling viewing of a password. This action no longer
maps to the current possible UI flows and its representation is
therefore marked as obsolete in this CL.

For more info see the discussion on the associated bug.

Bug: 807577
Change-Id: I79dc75a4d3a14cf1df7f46d1a5a2b26b664e5a0f
Reviewed-on: https://chromium-review.googlesource.com/962453Reviewed-by: Ilya Sherman <isherman@chromium.org>
Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Commit-Queue: Vaclav Brozek <vabr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543503}

chrome/android/java/src/org/chromium/chrome/browser/preferences/password/PasswordEntryEditor.java

@@ -48,7 +48,7 @@ public class PasswordEntryEditor extends Fragment {
     // entries must not be overwritten.
     private static final int PASSWORD_ENTRY_ACTION_VIEWED = 0;
     private static final int PASSWORD_ENTRY_ACTION_DELETED = 1;
-    private static final int PASSWORD_ENTRY_ACTION_CANCELLED = 2;
+    // Value 2 used to mean 'cancel' and is now obsolete. See https://crbug.com/807577 for details.
     private static final int PASSWORD_ENTRY_ACTION_VIEWED_AFTER_SEARCH = 3;
     private static final int PASSWORD_ENTRY_ACTION_BOUNDARY = 4;
 

tools/metrics/histograms/enums.xml

@@ -34151,7 +34151,7 @@ Called by update_net_trust_anchors.py.-->
 <enum name="PasswordManagerAndroidPasswordEntryActions">
   <int value="0" label="Viewed"/>
   <int value="1" label="Deleted"/>
-  <int value="2" label="Cancelled"/>
+  <int value="2" label="Cancelled (obsolete)"/>
   <int value="3" label="ViewedAfterSearched"/>
 </enum>