Clean up duplicate code in captured_sites_test_utils

As list of actions available grows the same code is replicated for
each action execution method. This CL adds a couple helper methods:
ExtractFrameAndVerifyElement
SimulateKeyPressWrapper
To encapsulate some logic in one place.

Add CloseTab and PressSpace actions to captured sites framework

Fixed multiple tests by adding additional methods and reviewing the
stored site recipe files.

Bug: 984664
Change-Id: I5ceb03e92e76e4dfaeff77e9b456961331e04b68
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1828230
Commit-Queue: Ian Struiksma <ianstruiksma@google.com>
Auto-Submit: Ian Struiksma <ianstruiksma@google.com>
Reviewed-by: Dominic Battré <battre@chromium.org>
Cr-Commit-Position: refs/heads/master@{#701695}

DEPS

@@ -452,7 +452,7 @@ deps = {
     'packages': [
       {
         'package': 'chromium/chrome/test/data/password/captured_sites',
-        'version': 'XxyN4JjdvL2TBSIFThfP0pJhd0-4COvFTOMCt356ht0C',
+        'version': 'q_mI3rtAXvNUW_X3zxca3VcUVdHkgwRqhfTLHt9H7rIC',
       }
     ],
     'condition': 'checkout_chromium_password_manager_test_dependencies',

chrome/browser/autofill/captured_sites_test_utils.h

@@ -298,10 +298,12 @@ class TestRecipeReplayer {
   bool ExecuteAutofillAction(const base::DictionaryValue& action);
   bool ExecuteClickAction(const base::DictionaryValue& action);
   bool ExecuteCoolOffAction(const base::DictionaryValue& action);
+  bool ExecuteCloseTabAction(const base::DictionaryValue& action);
   bool ExecuteHoverAction(const base::DictionaryValue& action);
   bool ExecuteForceLoadPage(const base::DictionaryValue& action);
   bool ExecutePressEnterAction(const base::DictionaryValue& action);
   bool ExecutePressEscapeAction(const base::DictionaryValue& action);
+  bool ExecutePressSpaceAction(const base::DictionaryValue& action);
   bool ExecuteRunCommandAction(const base::DictionaryValue& action);
   bool ExecuteSavePasswordAction(const base::DictionaryValue& action);
   bool ExecuteSelectDropdownAction(const base::DictionaryValue& action);
@@ -322,6 +324,11 @@ class TestRecipeReplayer {
   bool GetTargetHTMLElementVisibilityEnumFromAction(
       const base::DictionaryValue& action,
       int* visibility_enum_val);
+  bool ExtractFrameAndVerifyElement(const base::DictionaryValue& action,
+                                    std::string* xpath,
+                                    content::RenderFrameHost** frame,
+                                    bool set_focus = false,
+                                    bool relaxed_visibility = false);
   bool WaitForElementToBeReady(const std::string& xpath,
                                const int visibility_enum_val,
                                content::RenderFrameHost* frame);
@@ -347,6 +354,8 @@ class TestRecipeReplayer {
       const std::string& expected_value,
       const std::string& validation_field,
       const bool ignoreCase = false);
+  void SimulateKeyPressWrapper(content::WebContents* web_contents,
+                               ui::DomKey key);
   void NavigateAwayAndDismissBeforeUnloadDialog();
   bool HasChromeStoredCredential(const base::DictionaryValue& action,
                                  bool* stored_cred);

chrome/test/data/password/captured_sites/testcases.json

@@ -2,18 +2,18 @@
   "tests": [
     { "scenario_dir":"capture_update_pass", "site_name":"4shared" },
     { "scenario_dir":"capture_update_pass", "site_name":"allegro" },
-    { "scenario_dir":"capture_update_pass", "site_name":"amazon", "disabled":true, "bug_number":984662 },
+    { "scenario_dir":"capture_update_pass", "site_name":"amazon" },
     { "scenario_dir":"capture_update_pass", "site_name":"autodesk" },
-    { "scenario_dir":"capture_update_pass", "site_name":"clever", "disabled":true, "bug_number":984662 },
-    { "scenario_dir":"capture_update_pass", "site_name":"github", "disabled":true, "bug_number":951847 },
+    { "scenario_dir":"capture_update_pass", "site_name":"clever" },
+    { "scenario_dir":"capture_update_pass", "site_name":"github" },
     { "scenario_dir":"capture_update_pass", "site_name":"go_daddy" },
     { "scenario_dir":"capture_update_pass", "site_name":"grammarly" },
     { "scenario_dir":"capture_update_pass", "site_name":"indeed" },
     { "scenario_dir":"capture_update_pass", "site_name":"librus" },
     { "scenario_dir":"capture_update_pass", "site_name":"mit" },
     { "scenario_dir":"capture_update_pass", "site_name":"naukri" },
-    { "scenario_dir":"capture_update_pass", "site_name":"nexon", "disabled":true, "bug_number":1006335 },
-    { "scenario_dir":"capture_update_pass", "site_name":"paypal", "disabled":true, "bug_number":951847 },
+    { "scenario_dir":"capture_update_pass", "site_name":"nexon" },
+    { "scenario_dir":"capture_update_pass", "site_name":"paypal" },
     { "scenario_dir":"capture_update_pass", "site_name":"rakuten" },
     { "scenario_dir":"capture_update_pass", "site_name":"readtheory" },
     { "scenario_dir":"capture_update_pass", "site_name":"roblox" },
@@ -24,7 +24,7 @@
     { "scenario_dir":"capture_update_pass", "site_name":"wargaming" },
     { "scenario_dir":"capture_update_pass", "site_name":"yahoo" },
     { "scenario_dir":"sign_in_pass", "site_name":"4shared" },
-    { "scenario_dir":"sign_in_pass", "site_name":"airbnb", "disabled":true, "bug_number":951847 },
+    { "scenario_dir":"sign_in_pass", "site_name":"airbnb" },
     { "scenario_dir":"sign_in_pass", "site_name":"allegro" },
     { "scenario_dir":"sign_in_pass", "site_name":"amazon" },
     { "scenario_dir":"sign_in_pass", "site_name":"autodesk" },
@@ -36,7 +36,7 @@
     { "scenario_dir":"sign_in_pass", "site_name":"freelancer" },
     { "scenario_dir":"sign_in_pass", "site_name":"garena" },
     { "scenario_dir":"sign_in_pass", "site_name":"gearbest" },
-    { "scenario_dir":"sign_in_pass", "site_name":"github", "disabled":true, "bug_number":951847 },
+    { "scenario_dir":"sign_in_pass", "site_name":"github" },
     { "scenario_dir":"sign_in_pass", "site_name":"go_daddy" },
     { "scenario_dir":"sign_in_pass", "site_name":"grammarly" },
     { "scenario_dir":"sign_in_pass", "site_name":"groupon" },
@@ -51,10 +51,10 @@
     { "scenario_dir":"sign_in_pass", "site_name":"nexon" },
     { "scenario_dir":"sign_in_pass", "site_name":"nitro_type" },
     { "scenario_dir":"sign_in_pass", "site_name":"ok_ru" },
-    { "scenario_dir":"sign_in_pass", "site_name":"paypal", "disabled":true, "bug_number":951847 },
+    { "scenario_dir":"sign_in_pass", "site_name":"paypal" },
     { "scenario_dir":"sign_in_pass", "site_name":"pinterest" },
     { "scenario_dir":"sign_in_pass", "site_name":"quia" },
-    { "scenario_dir":"sign_in_pass", "site_name":"quizlet", "locally":"FAIL" },
+    { "scenario_dir":"sign_in_pass", "site_name":"quizlet" },
     { "scenario_dir":"sign_in_pass", "site_name":"rakuten" },
     { "scenario_dir":"sign_in_pass", "site_name":"readtheory" },
     { "scenario_dir":"sign_in_pass", "site_name":"rediff" },
@@ -69,7 +69,7 @@
     { "scenario_dir":"sign_in_pass", "site_name":"wp_pl" },
     { "scenario_dir":"sign_in_pass", "site_name":"yahoo" },
     { "scenario_dir":"sign_in_pass", "site_name":"zoho" },
-    { "scenario_dir":"sign_up_fill", "site_name":"4shared", "disabled":true, "bug_number":984662, "locally":"PASS" },
+    { "scenario_dir":"sign_up_fill", "site_name":"4shared" },
     { "scenario_dir":"sign_up_fill", "site_name":"aliexpress" },
     { "scenario_dir":"sign_up_fill", "site_name":"allegro" },
     { "scenario_dir":"sign_up_fill", "site_name":"amazon" },
@@ -79,14 +79,14 @@
     { "scenario_dir":"sign_up_fill", "site_name":"bet_365" },
     { "scenario_dir":"sign_up_fill", "site_name":"clever" },
     { "scenario_dir":"sign_up_fill", "site_name":"daum" },
-    { "scenario_dir":"sign_up_fill", "site_name":"discord_app", "disabled":true, "bug_number":951847 },
-    { "scenario_dir":"sign_up_fill", "site_name":"dreambox", "disabled":true, "bug_number":984662, "locally":"FAIL" },
+    { "scenario_dir":"sign_up_fill", "site_name":"discord_app" },
+    { "scenario_dir":"sign_up_fill", "site_name":"dreambox" },
     { "scenario_dir":"sign_up_fill", "site_name":"ea" },
     { "scenario_dir":"sign_up_fill", "site_name":"ebay" },
     { "scenario_dir":"sign_up_fill", "site_name":"edmodo" },
-    { "scenario_dir":"sign_up_fill", "site_name":"elvenar", "disabled":true, "bug_number":984662, "locally":"PASS" },
+    { "scenario_dir":"sign_up_fill", "site_name":"elvenar" },
     { "scenario_dir":"sign_up_fill", "site_name":"epic_games" },
-    { "scenario_dir":"sign_up_fill", "site_name":"forgeofempires", "disabled":true, "bug_number":984662, "locally":"PASS" },
+    { "scenario_dir":"sign_up_fill", "site_name":"forgeofempires" },
     { "scenario_dir":"sign_up_fill", "site_name":"freelancer" },
     { "scenario_dir":"sign_up_fill", "site_name":"garena" },
     { "scenario_dir":"sign_up_fill", "site_name":"go_daddy" },
@@ -101,7 +101,7 @@
     { "scenario_dir":"sign_up_fill", "site_name":"naver" },
     { "scenario_dir":"sign_up_fill", "site_name":"olx" },
     { "scenario_dir":"sign_up_fill", "site_name":"orange" },
-    { "scenario_dir":"sign_up_fill", "site_name":"paypal", "disabled":true, "bug_number":951847 },
+    { "scenario_dir":"sign_up_fill", "site_name":"paypal" },
     { "scenario_dir":"sign_up_fill", "site_name":"pch" },
     { "scenario_dir":"sign_up_fill", "site_name":"rakuten" },
     { "scenario_dir":"sign_up_fill", "site_name":"readtheory" },
@@ -113,22 +113,22 @@
     { "scenario_dir":"sign_up_fill", "site_name":"typing" },
     { "scenario_dir":"sign_up_fill", "site_name":"upwork" },
     { "scenario_dir":"sign_up_fill", "site_name":"usps" },
-    { "scenario_dir":"sign_up_fill", "site_name":"vodafone", "disabled":true, "bug_number":984662, "locally":"FAIL" },
+    { "scenario_dir":"sign_up_fill", "site_name":"vodafone" },
     { "scenario_dir":"sign_up_fill", "site_name":"walmart" },
     { "scenario_dir":"sign_up_fill", "site_name":"wargaming" },
-    { "scenario_dir":"sign_up_fill", "site_name":"xiaomi", "disabled":true, "bug_number":984662, "locally":"FAIL" },
+    { "scenario_dir":"sign_up_fill", "site_name":"xiaomi" },
     { "scenario_dir":"sign_up_fill", "site_name":"yahoo" },
     { "scenario_dir":"sign_up_fill", "site_name":"zoho" },
     { "scenario_dir":"sign_up_pass", "site_name":"4shared" },
     { "scenario_dir":"sign_up_pass", "site_name":"adobe" },
-    { "scenario_dir":"sign_up_pass", "site_name":"airbnb", "disabled":true, "bug_number":951847 },
+    { "scenario_dir":"sign_up_pass", "site_name":"airbnb" },
     { "scenario_dir":"sign_up_pass", "site_name":"amazon" },
     { "scenario_dir":"sign_up_pass", "site_name":"aol" },
-    { "scenario_dir":"sign_up_pass", "site_name":"autodesk", "disabled":true, "bug_number":984662, "locally":"FAIL" },
+    { "scenario_dir":"sign_up_pass", "site_name":"autodesk" },
     { "scenario_dir":"sign_up_pass", "site_name":"battle_net" },
     { "scenario_dir":"sign_up_pass", "site_name":"booking" },
     { "scenario_dir":"sign_up_pass", "site_name":"clever" },
-    { "scenario_dir":"sign_up_pass", "site_name":"discord_app", "disabled":true, "bug_number":951847 },
+    { "scenario_dir":"sign_up_pass", "site_name":"discord_app" },
     { "scenario_dir":"sign_up_pass", "site_name":"ea" },
     { "scenario_dir":"sign_up_pass", "site_name":"ebay" },
     { "scenario_dir":"sign_up_pass", "site_name":"edmodo" },
@@ -148,9 +148,9 @@
     { "scenario_dir":"sign_up_pass", "site_name":"marriott" },
     { "scenario_dir":"sign_up_pass", "site_name":"nitro_type" },
     { "scenario_dir":"sign_up_pass", "site_name":"orange" },
-    { "scenario_dir":"sign_up_pass", "site_name":"paypal", "disabled":true, "bug_number":984662, "locally":"FAIL" },
+    { "scenario_dir":"sign_up_pass", "site_name":"paypal" },
     { "scenario_dir":"sign_up_pass", "site_name":"pch" },
-    { "scenario_dir":"sign_up_pass", "site_name":"pinterest", "disabled":true, "bug_number":984662, "locally":"FAIL" },
+    { "scenario_dir":"sign_up_pass", "site_name":"pinterest" },
     { "scenario_dir":"sign_up_pass", "site_name":"quia" },
     { "scenario_dir":"sign_up_pass", "site_name":"quizlet" },
     { "scenario_dir":"sign_up_pass", "site_name":"rakuten" },
@@ -164,8 +164,8 @@
     { "scenario_dir":"sign_up_pass", "site_name":"typing" },
     { "scenario_dir":"sign_up_pass", "site_name":"united", "locally":"FAIL" },
     { "scenario_dir":"sign_up_pass", "site_name":"upwork" },
-    { "scenario_dir":"sign_up_pass", "site_name":"usps", "disabled":true, "bug_number":984662, "locally":"FAIL" },
-    { "scenario_dir":"sign_up_pass", "site_name":"vodafone", "disabled":true, "bug_number":984662, "locally":"FAIL" },
+    { "scenario_dir":"sign_up_pass", "site_name":"usps" },
+    { "scenario_dir":"sign_up_pass", "site_name":"vodafone" },
     { "scenario_dir":"sign_up_pass", "site_name":"walmart" },
     { "scenario_dir":"sign_up_pass", "site_name":"xiaomi" },
     { "scenario_dir":"sign_up_pass", "site_name":"yahoo" },