Add flag to enable/disable affiliaton based matching.

chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 8c42545e554432e49a4fc2b36ce8bb4f3ade9947..0a36b452c3641573f8296e4d7d49d66ad10d6a4a 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6306,6 +6306,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_ENABLE_SAVE_PASSOWRD_ON_IN_PAGE_NAVIGATION_DESCRIPTION" desc="Description of the flag to enable showing of password save prompt on in-page navigations">
         Enable showing of the password prompt on in-page navigations. This allows for saving passwords on more pages but might sometimes trigger the prompt on unsuccessful login attempts.
       </message>
+      <message name="IDS_FLAGS_ENABLE_AFFILIATION_BASED_MATCHING_NAME" desc="Name of the flag to 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'.">
+        Enable affiliation based matching in password manager.
+      </message>
+      <message name="IDS_FLAGS_ENABLE_AFFILIATION_BASED_MATCHING_DESCRIPTION" desc="Description of the flag to 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'.">
+        Allow credentials stored for Android or Web applications to be autofilled into affiliated applications.
+      </message>
       <message name="IDS_FLAGS_AUTOFILL_SYNC_CREDENTIAL_NAME" desc="Name of the flag specifying how the browser will handle autofilling the users sync credential.">
         Autofill sync credential
       </message>