Re-add unsed access point of sign in metrics

Removing the deprecated enum option breaks metrics count. Add it back with
a deprecation message.

Bug: 913103
Change-Id: Ia06712e466747989e38cf999dd199918e995a8c1
Reviewed-on: https://chromium-review.googlesource.com/c/1368632
Commit-Queue: Owen Min <zmin@chromium.org>
Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615603}

components/signin/core/browser/signin_metrics.h

@@ -132,31 +132,33 @@ enum Source {
 // GENERATED_JAVA_CLASS_NAME_OVERRIDE: SigninAccessPoint
 enum class AccessPoint : int {
   ACCESS_POINT_START_PAGE = 0,
-  ACCESS_POINT_NTP_LINK,
-  ACCESS_POINT_MENU,
-  ACCESS_POINT_SETTINGS,
-  ACCESS_POINT_SUPERVISED_USER,
-  ACCESS_POINT_EXTENSION_INSTALL_BUBBLE,
-  ACCESS_POINT_EXTENSIONS,
-  ACCESS_POINT_APPS_PAGE_LINK,
-  ACCESS_POINT_BOOKMARK_BUBBLE,
-  ACCESS_POINT_BOOKMARK_MANAGER,
-  ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN,
-  ACCESS_POINT_USER_MANAGER,
-  ACCESS_POINT_DEVICES_PAGE,
-  ACCESS_POINT_CLOUD_PRINT,
-  ACCESS_POINT_CONTENT_AREA,
-  ACCESS_POINT_SIGNIN_PROMO,
-  ACCESS_POINT_RECENT_TABS,
-  ACCESS_POINT_UNKNOWN,  // This should never have been used to get signin URL.
-  ACCESS_POINT_PASSWORD_BUBBLE,
-  ACCESS_POINT_AUTOFILL_DROPDOWN,
-  ACCESS_POINT_NTP_CONTENT_SUGGESTIONS,
-  ACCESS_POINT_RESIGNIN_INFOBAR,
-  ACCESS_POINT_TAB_SWITCHER,
-  ACCESS_POINT_SAVE_CARD_BUBBLE,
-  ACCESS_POINT_MANAGE_CARDS_BUBBLE,
-  ACCESS_POINT_MACHINE_LOGON,
+  ACCESS_POINT_NTP_LINK = 1,
+  ACCESS_POINT_MENU = 2,
+  ACCESS_POINT_SETTINGS = 3,
+  ACCESS_POINT_SUPERVISED_USER = 4,
+  ACCESS_POINT_EXTENSION_INSTALL_BUBBLE = 5,
+  ACCESS_POINT_EXTENSIONS = 6,
+  ACCESS_POINT_APPS_PAGE_LINK = 7,
+  ACCESS_POINT_BOOKMARK_BUBBLE = 8,
+  ACCESS_POINT_BOOKMARK_MANAGER = 9,
+  ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN = 10,
+  ACCESS_POINT_USER_MANAGER = 11,
+  ACCESS_POINT_DEVICES_PAGE = 12,
+  ACCESS_POINT_CLOUD_PRINT = 13,
+  ACCESS_POINT_CONTENT_AREA = 14,
+  ACCESS_POINT_SIGNIN_PROMO = 15,
+  ACCESS_POINT_RECENT_TABS = 16,
+  // This should never have been used to get signin URL.
+  ACCESS_POINT_UNKNOWN = 17,
+  ACCESS_POINT_PASSWORD_BUBBLE = 18,
+  ACCESS_POINT_AUTOFILL_DROPDOWN = 19,
+  ACCESS_POINT_NTP_CONTENT_SUGGESTIONS = 20,
+  ACCESS_POINT_RESIGNIN_INFOBAR = 21,
+  ACCESS_POINT_TAB_SWITCHER = 22,
+  // ACCESS_POINT_FORCE_SIGNIN_WARNING is no longer used.
+  ACCESS_POINT_SAVE_CARD_BUBBLE = 24,
+  ACCESS_POINT_MANAGE_CARDS_BUBBLE = 25,
+  ACCESS_POINT_MACHINE_LOGON = 26,
   ACCESS_POINT_MAX,  // This must be last.
 };
 

components/signin/core/browser/signin_metrics_unittest.cc

@@ -118,6 +118,9 @@ class SigninMetricsTest : public ::testing::Test {
     std::vector<AccessPoint> access_points;
     for (int ap = 0; ap < static_cast<int>(AccessPoint::ACCESS_POINT_MAX);
          ++ap) {
+      // Skip the deprecated ACCESS_POINT_FORCE_SIGNIN_WARNING
+      if (ap == 23)
+        continue;
       access_points.push_back(static_cast<AccessPoint>(ap));
     }
     return access_points;