Default to malware interstitial v3

chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Implementation of the SafeBrowsingBlockingPage class.
 
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
 
 #include <string>
 
@@ skipping 132 matching lines @@
   PHISHING_PROCEED_CROSS_SITE,
   MAX_DETAILED_ACTION
 };
 
 void RecordDetailedUserAction(DetailedDecision decision) {
   UMA_HISTOGRAM_ENUMERATION("SB2.InterstitialActionDetails",
                             decision,
                             MAX_DETAILED_ACTION);
 }
 
+// These are the constants for the M37 Finch trial.
+const char kV3StudyName[] = "MalwareInterstitialVersion";
+const char kCondUseV2[] = "V2";
+
+// Default to V3 unless a flag or field trial says otherwise.
 bool Version3Enabled() {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kMalwareInterstitialVersionV3)) {
-    return true;
+      switches::kMalwareInterstitialVersionV2)) {
+    return false;
   }
-  return false;
+  if (base::FieldTrialList::FindFullName(kV3StudyName) == kCondUseV2)
+    return false;
+  return true;
 }
 
 }  // namespace
 
 // static
 SafeBrowsingBlockingPageFactory* SafeBrowsingBlockingPage::factory_ = NULL;
 
 // The default SafeBrowsingBlockingPageFactory.  Global, made a singleton so we
 // don't leak it.
 class SafeBrowsingBlockingPageFactoryImpl
@@ skipping 1167 matching lines @@
           IDS_PHISHING_V3_PRIMARY_PARAGRAPH,
           base::UTF8ToUTF16(url_.host())));
   load_time_data->SetString(
       "explanationParagraph",
       l10n_util::GetStringFUTF16(IDS_PHISHING_V3_EXPLANATION_PARAGRAPH,
                                  base::UTF8ToUTF16(url_.host())));
   load_time_data->SetString(
       "finalParagraph",
       l10n_util::GetStringUTF16(IDS_PHISHING_V3_PROCEED_PARAGRAPH));
 }