Introducing feature for filling on username first flow.

Bug: 959776
Change-Id: Id4e4c859dd929f302ee2b84550a94947e7cf56a5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1930834
Reviewed-by: Vasilii Sukhanov <[email protected]>
Commit-Queue: Vadym Doroshenko <[email protected]>
Cr-Commit-Position: refs/heads/master@{#721990}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 6d76053..9350c8c6 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1841,9 +1841,14 @@
     {"debug-packed-apps", flag_descriptions::kDebugPackedAppName,
      flag_descriptions::kDebugPackedAppDescription, kOsDesktop,
      SINGLE_VALUE_TYPE(switches::kDebugPackedApps)},
-    {"username-first-flow", flag_descriptions::kUsernameFirstFlowName,
-     flag_descriptions::kUsernameFirstFlowDescription, kOsAll,
-     FEATURE_VALUE_TYPE(password_manager::features::kUsernameFirstFlow)},
+    {"username-first-flow-filling",
+     flag_descriptions::kUsernameFirstFlowFillingName,
+     flag_descriptions::kUsernameFirstFlowFillingDescription, kOsAll,
+     FEATURE_VALUE_TYPE(password_manager::features::kUsernameFirstFlowFilling)},
+    {"username-first-flow-saving",
+     flag_descriptions::kUsernameFirstFlowSavingName,
+     flag_descriptions::kUsernameFirstFlowSavingDescription, kOsAll,
+     FEATURE_VALUE_TYPE(password_manager::features::kUsernameFirstFlowSaving)},
     {"enable-show-autofill-signatures",
      flag_descriptions::kShowAutofillSignaturesName,
      flag_descriptions::kShowAutofillSignaturesDescription, kOsAll,
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index 707fc40..0923cbb 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -3608,12 +3608,17 @@
     "expiry_milestone": 83
   },
   {
-    "name": "use-xps-for-printing",
+   "name": "use-xps-for-printing",
     "owners": [ "awscreen", "thestig" ],
     "expiry_milestone": 83
   },
   {
-    "name": "username-first-flow",
+    "name": "username-first-flow-filling",
+    "owners": [ "dvadym" ],
+    "expiry_milestone": 84
+  },
+  {
+    "name": "username-first-flow-saving",
     "owners": [ "dvadym" ],
     "expiry_milestone": 84
   },
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index 04e59189..205ff72 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2202,9 +2202,15 @@
 const char kUiPartialSwapName[] = "Partial swap";
 const char kUiPartialSwapDescription[] = "Sets partial swap behavior.";
 
-const char kUsernameFirstFlowName[] = "Username first flow";
-const char kUsernameFirstFlowDescription[] =
-    "Support of username saving and filling on username first flow i.e. login "
+const char kUsernameFirstFlowFillingName[] = "Filling on username first flow";
+const char kUsernameFirstFlowFillingDescription[] =
+    "Support of username filling on username first flow i.e. login "
+    "flows where a user has to type username first on one page and then "
+    "password on another page";
+
+const char kUsernameFirstFlowSavingName[] = "Saving on username first flow";
+const char kUsernameFirstFlowSavingDescription[] =
+    "Support of username saving on username first flow i.e. login "
     "flows where a user has to type username first on one page and then "
     "password on another page";
 
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index ed3eaa5..9aeace5 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -799,8 +799,11 @@
 extern const char kOnlyNewPasswordFormParsingName[];
 extern const char kOnlyNewPasswordFormParsingDescription[];
 
-extern const char kUsernameFirstFlowName[];
-extern const char kUsernameFirstFlowDescription[];
+extern const char kUsernameFirstFlowFillingName[];
+extern const char kUsernameFirstFlowFillingDescription[];
+
+extern const char kUsernameFirstFlowSavingName[];
+extern const char kUsernameFirstFlowSavingDescription[];
 
 extern const char kUseSurfaceLayerForVideoName[];
 extern const char kUseSurfaceLayerForVideoDescription[];
diff --git a/chrome/browser/password_manager/password_manager_captured_sites_interactive_uitest.cc b/chrome/browser/password_manager/password_manager_captured_sites_interactive_uitest.cc
index 05dd04f..a114eb9 100644
--- a/chrome/browser/password_manager/password_manager_captured_sites_interactive_uitest.cc
+++ b/chrome/browser/password_manager/password_manager_captured_sites_interactive_uitest.cc
@@ -175,7 +175,7 @@
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     feature_list_.InitWithFeatures(
-        /*enabled_features=*/{features::kUsernameFirstFlow}, {});
+        /*enabled_features=*/{features::kUsernameFirstFlowSaving}, {});
     InProcessBrowserTest::SetUpCommandLine(command_line);
     captured_sites_test_utils::TestRecipeReplayer::SetUpCommandLine(
         command_line);