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

chrome/browser/content_settings/permission_context_uma_util.cc

Index: chrome/browser/content_settings/permission_context_uma_util.cc
diff --git a/chrome/browser/content_settings/permission_context_uma_util.cc b/chrome/browser/content_settings/permission_context_uma_util.cc
index dd4c827669b642856dd3e9831ce70ec935b9651b..a1a3658f54156f198c6c6f7ef1f0c24940a629dc 100644
--- a/chrome/browser/content_settings/permission_context_uma_util.cc
+++ b/chrome/browser/content_settings/permission_context_uma_util.cc
@@ -8,6 +8,7 @@
 #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
@@ -80,7 +81,7 @@ const std::string GetRapporMetric(ContentSettingsType permission,
 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:
@@ -138,7 +139,7 @@ void RecordPermissionAction(ContentSettingsType permission,
 
 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: