Make form-not-secure controllable as its own separate Finch feature

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 5f638f60cb05027ebb21613f51a0843385097426..7299feb17c3e929ec4bf9d73dfc02cfc6f0feedd 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5358,6 +5358,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG">
         Debug only if manifest URL ends with debug.nmf.
       </message>
+      <message name="IDS_ENABLE_HTTP_FORM_WARNING_NAME" desc="Name of the 'HTTP form warning' lab.">

[Mathieu, 2016/12/19 23:56:00]

lab is unintuitive to me. How about "feature"?

[estark, 2016/12/20 02:07:02]

Done.

+        Show in-form warnings for sensitive fields when the top-level page is not HTTPS
+      </message>
+      <message name="IDS_ENABLE_HTTP_FORM_WARNING_DESCRIPTION" desc="Description of the 'HTTP form warning' lab.">
+        Attaches a warning UI to any password or credit card fields detected when the top-level page is not HTTPS
+      </message>
       <message name="IDS_MARK_HTTP_AS_NAME" desc="Name of the 'Mark Non-Secure Origins As' lab.">
         Mark non-secure origins as non-secure
       </message>
@@ -5373,9 +5379,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_MARK_HTTP_WITH_PASSWORDS_OR_CC_WITH_CHIP">
         Display a verbose state when password or credit card fields are detected on an HTTP page
       </message>
-      <message name="IDS_MARK_HTTP_WITH_PASSWORDS_OR_CC_WITH_CHIP_AND_FORM_WARNING">
-        Display a verbose state and form warning when password or credit card fields are detected on an HTTP page
-      </message>
       <message name="IDS_FLAGS_SAVE_PAGE_AS_MHTML_NAME" desc="Name of the 'Save Page as MHTML' lab.">
         Save Page as MHTML
       </message>