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

chrome/browser/ui/toolbar/toolbar_model_impl.cc

 // Copyright 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.
 
 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 69 matching lines @@
   if (!web_contents)
     return NONE;
 
   NavigationEntry* entry = web_contents->GetController().GetVisibleEntry();
   if (!entry)
     return NONE;
 
   const SSLStatus& ssl = entry->GetSSL();
   switch (ssl.security_style) {
     case content::SECURITY_STYLE_UNKNOWN:
-    case content::SECURITY_STYLE_UNAUTHENTICATED:
       return NONE;
+    case content::SECURITY_STYLE_UNAUTHENTICATED: {
+      base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
+      std::string choice =
+          cmd->GetSwitchValueASCII(switches::kMarkHttpAsNonSecure);
+      if (choice.empty()) {
+        ToolbarModel::SecurityLevel security_level = NONE;
+        if (GetSecurityLevelForFieldTrialGroup(

[jww, 2014/12/20 01:21:57]

According to Finch documentation, you should actually place this call *before*
you call GetSwitchValueASCII, because this registers the group for the user, and
we want to have that info for UMA purposes, even if they override the behavior
with a switch.

Frankly, I'd just throw the command line stuff into the
GetSecurityLevelForFieldTrialGroup function anyway and call it there. Then you
could have just one, nice function GetSecurityStyle that returns the appropriate
style based on field trial and switches.

[Ryan Sleevi, 2014/12/20 01:29:32]

See https://goto.google.com/finch-and-flags

[palmer, 2014/12/20 01:59:53]

OK, I think I did this right. I'm sure you'll let me know if not. :)

+                base::FieldTrialList::FindFullName("MarkHTTPAsNonSecure"),
+                &security_level)) {
+          return security_level;
+        }
+        return NONE;
+      } else if (choice == "dubious") {
+        return ToolbarModel::SECURITY_WARNING;
+      } else if (choice == "non-secure") {
+        return ToolbarModel::SECURITY_ERROR;
+      } else {
+        return NONE;
+      }
+    }
 
     case content::SECURITY_STYLE_AUTHENTICATION_BROKEN:
       return SECURITY_ERROR;
 
     case content::SECURITY_STYLE_AUTHENTICATED: {
 #if defined(OS_CHROMEOS)
       policy::PolicyCertService* service =
           policy::PolicyCertServiceFactory::GetForProfile(
               Profile::FromBrowserContext(web_contents->GetBrowserContext()));
       if (service && service->UsedPolicyCertificates())
@@ skipping 289 matching lines @@
   if (entry &&
       google_util::StartsWithCommandLineGoogleBaseURL(entry->GetVirtualURL()))
     return search_terms;
 
   // Otherwise, extract search terms for HTTPS pages that do not have a security
   // error.
   ToolbarModel::SecurityLevel security_level = GetSecurityLevel(ignore_editing);
   return ((security_level == NONE) || (security_level == SECURITY_ERROR)) ?
       base::string16() : search_terms;
 }