Set up flags for the malware and ssl interstitial trials

BUG=331453,380238

Review URL: https://codereview.chromium.org/313793002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274989 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 84 insertions, 0 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 3451d0e..0a06ba2 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -14237,6 +14237,38 @@ Do you accept?
     <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT" desc="Description of the 'Extension Content Verification' enforce strict mode">
       Enforce strict (hard fail if we can't get hashes)
     </message>
+
+    <!-- SSL interstitial V3 experiment -->
+    <message name="IDS_FLAGS_SSL_INTERSTITIAL_TRIAL_NAME" desc="Name of the about:flags SSL interstitial v2 experiment">
+      TLS/SSL Warning Experiment
+    </message>
+    <message name="IDS_FLAGS_SSL_INTERSTITIAL_TRIAL_DESCRIPTION" desc="Description of the about:flags SSL interstitial v2 experiment">
+      Switch between different versions of the TLS/SSL warning.
+    </message>
+    <message name="IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V1" desc="Go back to the old (V1) version">
+      Old version
+    </message>
+    <message name="IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_GRAY" desc="The new interstitial, with a gray background (also default)">
+      New version, with gray background
+    </message>
+    <message name="IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_COLORFUL" desc="The new interstitial, with a colorful background">
+      New version, with colorful background
+    </message>
+
+    <!-- Malware interstitial V3 experiment -->
+    <message name="IDS_FLAGS_MALWARE_INTERSTITIAL_TRIAL_NAME" desc="Name of the about:flags malware interstitial v3 experiment">
+      Malware Warning Experiment
+    </message>
+    <message name="IDS_FLAGS_MALWARE_INTERSTITIAL_TRIAL_DESCRIPTION" desc="Description of the about:flags malware interstitial v3 experiment">
+      Switch between different versions of the malware and phishing interstitials.
+    </message>
+    <message name="IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V2" desc="Go back to the old (V1) version">
+      Last version
+    </message>
+    <message name="IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3" desc="The new interstitial, with a gray background (also default)">
+      Newest version
+    </message>
+
   </messages>
   </release>
 </grit>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 3fd0d29..6f14635 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -403,6 +403,30 @@ const Experiment::Choice kExtensionContentVerificationChoices[] = {
     extensions::switches::kExtensionContentVerificationEnforceStrict },
 };
 
+// Using independent flags (instead of flag=value flags) to be able to
+// associate the version with a FieldTrial. FieldTrials don't currently support
+// flag=value flags.
+const Experiment::Choice kSSLInterstitialVersions[] = {
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
+  { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V1,
+    switches::kSSLInterstitialVersionV1, "" },
+  { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_GRAY,
+    switches::kSSLInterstitialVersionV2Gray, "" },
+  { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_COLORFUL,
+    switches::kSSLInterstitialVersionV2Colorful, "" },
+};
+
+// Using independent flags (instead of flag=value flags) to be able to
+// associate the version with a FieldTrial. FieldTrials don't currently support
+// flag=value flags.
+const Experiment::Choice kMalwareInterstitialVersions[] = {
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
+  { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V2,
+    switches::kMalwareInterstitialVersionV2, "" },
+  { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V3,
+    switches::kMalwareInterstitialVersionV3, "" },
+};
+
 // RECORDING USER METRICS FOR FLAGS:
 // -----------------------------------------------------------------------------
 // The first line of the experiment is the internal name. If you'd like to
@@ -1844,6 +1868,20 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(switches::kEnableAnswersInSuggest)
   },
 #endif
+  {
+    "ssl-interstitial-version",
+    IDS_FLAGS_SSL_INTERSTITIAL_TRIAL_NAME,
+    IDS_FLAGS_SSL_INTERSTITIAL_TRIAL_DESCRIPTION,
+    kOsAll,
+    MULTI_VALUE_TYPE(kSSLInterstitialVersions)
+  },
+  {
+    "malware-interstitial-version",
+    IDS_FLAGS_MALWARE_INTERSTITIAL_TRIAL_NAME,
+    IDS_FLAGS_MALWARE_INTERSTITIAL_TRIAL_DESCRIPTION,
+    kOsAll,
+    MULTI_VALUE_TYPE(kMalwareInterstitialVersions)
+  },
 };
 
 const Experiment* experiments = kExperiments;
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 486a2f4..e5f13af 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -811,6 +811,10 @@ const char kLoadComponentExtension[]        = "load-component-extension";
 // Loads an extension from the specified directory.
 const char kLoadExtension[]                 = "load-extension";
 
+// Controls which version of the malware and phishing interstitials is shown.
+const char kMalwareInterstitialVersionV2[]  = "malware-interstitial-v2";
+const char kMalwareInterstitialVersionV3[]  = "malware-interstitial-v3";
+
 // Makes Chrome default browser
 const char kMakeDefaultBrowser[]            = "make-default-browser";
 
@@ -1139,6 +1143,11 @@ const char kSpellingServiceFeedbackUrl[] = "spelling-service-feedback-url";
 const char kSpellingServiceFeedbackIntervalSeconds[] =
     "spelling-service-feedback-interval-seconds";
 
+// Controls which version of the TLS/SSL interstitial is shown.
+const char kSSLInterstitialVersionV1[]         = "ssl-interstitial-v1";
+const char kSSLInterstitialVersionV2Gray[]     = "ssl-interstitial-v2-gray";
+const char kSSLInterstitialVersionV2Colorful[] = "ssl-interstitial-v2-colorful";
+
 // Specifies the maximum SSL/TLS version ("ssl3", "tls1", "tls1.1", or
 // "tls1.2").
 const char kSSLVersionMax[]                 = "ssl-version-max";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index e7a094e..00b226a 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -229,6 +229,8 @@ extern const char kLedgerTracingToken[];
 extern const char kLimitedInstallFromWebstore[];
 extern const char kLoadComponentExtension[];
 extern const char kLoadExtension[];
+extern const char kMalwareInterstitialVersionV2[];
+extern const char kMalwareInterstitialVersionV3[];
 extern const char kMakeDefaultBrowser[];
 extern const char kManagedUserId[];
 extern const char kManagedUserSyncToken[];
@@ -311,6 +313,9 @@ extern const char kSimulateOutdated[];
 extern const char kSimulateOutdatedNoAU[];
 extern const char kSpellingServiceFeedbackUrl[];
 extern const char kSpellingServiceFeedbackIntervalSeconds[];
+extern const char kSSLInterstitialVersionV1[];
+extern const char kSSLInterstitialVersionV2Gray[];
+extern const char kSSLInterstitialVersionV2Colorful[];
 extern const char kSSLVersionMax[];
 extern const char kSSLVersionMin[];
 extern const char kStartMaximized[];