Add flag to enable/disable affiliaton based matching.

components/password_manager/core/common/password_manager_switches.cc

Index: components/password_manager/core/common/password_manager_switches.cc
diff --git a/components/password_manager/core/common/password_manager_switches.cc b/components/password_manager/core/common/password_manager_switches.cc
index 3b71d82ef8c46c9a21819c56ffa6acf2e7760c4b..4b0c416cbb2ac9159181024c649b718c966fea5b 100644
--- a/components/password_manager/core/common/password_manager_switches.cc
+++ b/components/password_manager/core/common/password_manager_switches.cc
@@ -11,6 +11,12 @@ namespace switches {
 // Force the password manager to allow sync credentials to be autofilled.
 const char kAllowAutofillSyncCredential[] = "allow-autofill-sync-credential";
 
+// Disable affiliation based matching, so that credentials stored for one (Web
+// or Android) application will not be considered a match for autofilling into
+// another, affiliated application.
+const char kDisableAffiliationBasedMatching[] =
+    "disable-affiliation-based-matching";
+
 // Disable dropping the credential used to sync passwords.
 const char kDisableDropSyncCredential[] = "disable-drop-sync-credential";
 
@@ -30,6 +36,12 @@ const char kDisallowAutofillSyncCredential[] =
 const char kDisallowAutofillSyncCredentialForReauth[] =
     "disallow-autofill-sync-credential-for-reauth";
 
+// Enable affiliation based matching, so that credentials stored for one (Web or
+// Android) application will also be considered a match for autofilling into
+// another application if the two applications are affiliated.
+const char kEnableAffiliationBasedMatching[] =
+    "enable-affiliation-based-matching";
+
 // Disables the save-password prompt. Passwords are then saved automatically,
 // without asking the user.
 const char kEnableAutomaticPasswordSaving[] =