Add field trial and flag to mark HTTP as non-secure.

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 8e458b719f1bc853d8aaa4c740d60b090e49b7a8..47c297ad0a1c581d89155d6105c03fb567d0209f 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -188,6 +188,15 @@ const Experiment::Choice kNaClDebugMaskChoices[] = {
 };
 #endif
 
+const Experiment::Choice kMarkHttpAsNonSecureChoices[] = {
+    { IDS_MARK_HTTP_AS_NON_SECURE_CHOICE_NO,
+        switches::kMarkHttpAsNonSecure, "no"},
+    { IDS_MARK_HTTP_AS_NON_SECURE_CHOICE_NON_SECURE,
+        switches::kMarkHttpAsNonSecure, "non-secure"},
+    { IDS_MARK_HTTP_AS_NON_SECURE_CHOICE_DUBIOUS,
+        switches::kMarkHttpAsNonSecure, "dubious"}
+};
+
 const Experiment::Choice kMaxTilesForInterestAreaChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_FLAGS_MAX_TILES_FOR_INTEREST_AREA_SHORT,
@@ -2088,6 +2097,14 @@ const Experiment kExperiments[] = {
                               autofill::switches::kDisableFillOnAccountSelect)
   },
 
+  {
+    "mark-http-as-non-secure",  // FLAGS:RECORD_UMA

[jww, 2014/12/20 02:07:58]

Somewhere at the top of this array, there are instructions on how to update
histograms.xml appropriately. You'll need to do that before passing the
presubmit, I believe.

[palmer, 2014/12/20 02:32:33]

Done.

+     IDS_MARK_HTTP_AS_NON_SECURE_NAME,
+     IDS_MARK_HTTP_AS_NON_SECURE_DESCRIPTION,
+     kOsAll,
+     MULTI_VALUE_TYPE(kMarkHttpAsNonSecureChoices)
+  },
+
   // NOTE: Adding new command-line switches requires adding corresponding
   // entries to enum "LoginCustomFlags" in histograms.xml. See note in
   // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.