From d522554d6554e461249a0041716d1574cb34e3e3 Mon Sep 17 00:00:00 2001 From: asargent Date: Mon, 31 Aug 2015 18:38:29 -0700 Subject: [PATCH] Change default content verification mode for Google Chrome builds It's been configured to be set to 'enforce' mode via the server-side experiment for quite a while, so it makes sense to have it turned on by default in the code as well. BUG=526873 Review URL: https://codereview.chromium.org/1307103003 Cr-Commit-Position: refs/heads/master@{#346552} --- chrome/browser/extensions/chrome_content_verifier_delegate.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/chrome/browser/extensions/chrome_content_verifier_delegate.cc b/chrome/browser/extensions/chrome_content_verifier_delegate.cc index c181e5eb93ed..0a31a5463f0e 100644 --- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc +++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc @@ -41,7 +41,12 @@ namespace extensions { ContentVerifierDelegate::Mode ChromeContentVerifierDelegate::GetDefaultMode() { base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); - Mode experiment_value = NONE; + Mode experiment_value; +#if defined(GOOGLE_CHROME_BUILD) + experiment_value = ContentVerifierDelegate::ENFORCE; +#else + experiment_value = ContentVerifierDelegate::NONE; +#endif const std::string group = base::FieldTrialList::FindFullName(kContentVerificationExperimentName); if (group == "EnforceStrict") @@ -50,6 +55,8 @@ ContentVerifierDelegate::Mode ChromeContentVerifierDelegate::GetDefaultMode() { experiment_value = ContentVerifierDelegate::ENFORCE; else if (group == "Bootstrap") experiment_value = ContentVerifierDelegate::BOOTSTRAP; + else if (group == "None") + experiment_value = ContentVerifierDelegate::NONE; // The field trial value that normally comes from the server can be // overridden on the command line, which we don't want to allow since -- 2.11.4.GIT