Fixes issues with password manager captured sites tests.

Fixed test instantiation.
Fixed a bug where an empty autofill profile causes the password manager
tests to fail, since password tests do not know how to setup Chrome's
autofill profile.

Bug: 847905
Change-Id: Ic76163b28e97c102ed9c7944685aae115629e067
Reviewed-on: https://chromium-review.googlesource.com/c/1320931Reviewed-by: Sebastien Seguin-Gagnon <sebsg@chromium.org>
Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Commit-Queue: Yiming Zhou <uwyiming@google.com>
Cr-Commit-Position: refs/heads/master@{#606132}

chrome/browser/autofill/captured_sites_test_utils.cc

@@ -1489,6 +1489,16 @@ bool TestRecipeReplayer::SetupSavedAutofillProfile(
     }
   }
 
+  // Skip this step if autofill profile is empty.
+  // Only Autofill Captured Sites test recipes will have non-empty autofill
+  // profiles. Recipes for other captured sites tests will have empty autofill
+  // profiles. This block prevents these other tests from failing because
+  // the test feature action executor does not know how to setup the autofill
+  // profile.
+  if (profile_entries_list.size() == 0) {
+    return true;
+  }
+
   return feature_action_executor()->SetupAutofillProfile();
 }
 

chrome/browser/password_manager/password_manager_captured_sites_interactive_uitest.cc

@@ -210,7 +210,7 @@ IN_PROC_BROWSER_TEST_P(CapturedSitesPasswordManagerBrowserTest, Recipe) {
       recipe_replayer()->ReplayTest(capture_file_path, recipe_file_path));
 }
 
-INSTANTIATE_TEST_CASE_P(All,
+INSTANTIATE_TEST_CASE_P(,
                         CapturedSitesPasswordManagerBrowserTest,
                         testing::ValuesIn(GetCapturedSites()),
                         GetParamAsString());