Switch //chrome/browser code to use IsOriginSecure() instead of SchemeIsSecure().

chrome/browser/content_settings/permission_context_uma_util.cc

 // Copyright 2014 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 "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/permission_context_uma_util.h"
 #include "components/rappor/rappor_utils.h"
 #include "content/public/browser/permission_type.h"
+#include "content/public/common/origin_util.h"
 #include "url/gurl.h"
 
 // UMA keys need to be statically initialized so plain function would not
 // work. Use a Macro instead.
 #define PERMISSION_ACTION_UMA(secure_origin, permission, permission_secure, \
                               permission_insecure, action)                  \
   UMA_HISTOGRAM_ENUMERATION(permission, action, PERMISSION_ACTION_NUM);     \
   if (secure_origin) {                                                      \
     UMA_HISTOGRAM_ENUMERATION(permission_secure, action,                    \
                               PERMISSION_ACTION_NUM);                       \
@@ skipping 52 matching lines @@
 
   if (permission_str.empty())
     return "";
   return base::StringPrintf("ContentSettings.PermissionActions_%s.%s.Url",
                             permission_str.c_str(), action_str.c_str());
 }
 
 void RecordPermissionAction(ContentSettingsType permission,
                             PermissionAction action,
                             const GURL& requesting_origin) {
-  bool secure_origin = requesting_origin.SchemeIsSecure();
+  bool secure_origin = IsOriginSecure(requesting_origin);

[Bernhard Bauer, 2015/05/11 07:47:12]

+Miguel

I think this makes sense, but at the very least we should be aware that we are
changing the definition of these histograms now.

 
   switch (permission) {
       case CONTENT_SETTINGS_TYPE_GEOLOCATION:
         PERMISSION_ACTION_UMA(
             secure_origin,
             "ContentSettings.PermissionActions_Geolocation",
             "ContentSettings.PermissionActionsSecureOrigin_Geolocation",
             "ContentSettings.PermissionActionsInsecureOrigin_Geolocation",
             action);
         break;
@@ skipping 37 matching lines @@
 
     const std::string& rappor_metric = GetRapporMetric(permission, action);
     if (!rappor_metric.empty())
       rappor::SampleDomainAndRegistryFromGURL(
           g_browser_process->rappor_service(), rappor_metric,
           requesting_origin);
 }
 
 void RecordPermissionRequest(ContentSettingsType permission,
                              const GURL& requesting_origin) {
-  bool secure_origin = requesting_origin.SchemeIsSecure();
+  bool secure_origin = IsOriginSecure(requesting_origin);
   content::PermissionType type;
   switch (permission) {
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       type = content::PermissionType::GEOLOCATION;
       rappor::SampleDomainAndRegistryFromGURL(
           g_browser_process->rappor_service(),
           "ContentSettings.PermissionRequested.Geolocation.Url",
           requesting_origin);
       break;
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
@@ skipping 56 matching lines @@
 
 void PermissionContextUmaUtil::PermissionDismissed(
     ContentSettingsType permission, const GURL& requesting_origin) {
   RecordPermissionAction(permission, DISMISSED, requesting_origin);
 }
 
 void PermissionContextUmaUtil::PermissionIgnored(
     ContentSettingsType permission, const GURL& requesting_origin) {
   RecordPermissionAction(permission, IGNORED, requesting_origin);
 }