Switch web API/permission code to use IsOriginSecure() instead of SchemeIsSecure().

chrome/browser/media/media_stream_devices_controller.cc

Index: chrome/browser/media/media_stream_devices_controller.cc
diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc
index 0f08b8c6a39bcea91cab7eb5d8685c0b7edc5773..e069410b7dd96e509bba7ad199527e177c5824d9 100644
--- a/chrome/browser/media/media_stream_devices_controller.cc
+++ b/chrome/browser/media/media_stream_devices_controller.cc
@@ -24,6 +24,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/common/media_stream_request.h"
+#include "content/public/common/origin_util.h"
 #include "extensions/common/constants.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -376,7 +377,7 @@ void MediaStreamDevicesController::Accept(bool update_content_setting) {
     // websites for Pepper requests as well. This is temporary and should be
     // removed.
     if (update_content_setting) {
-      if ((IsSchemeSecure() && !devices.empty()) ||
+      if ((IsOriginSecure(request_.security_origin) && !devices.empty()) ||
           request_.request_type == content::MEDIA_OPEN_DEVICE) {
         StorePermission(true);
       }
@@ -465,7 +466,7 @@ GURL MediaStreamDevicesController::GetRequestingHostname() const {
 
 void MediaStreamDevicesController::PermissionGranted() {
   GURL origin(GetSecurityOriginSpec());
-  if (origin.SchemeIsSecure()) {
+  if (IsOriginSecure(origin)) {
     UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions",
                               kAllowHttps, kPermissionActionsMax);
   } else {
@@ -531,7 +532,7 @@ bool MediaStreamDevicesController::IsRequestAllowedByDefault() const {
     if (policy == POLICY_NOT_SET) {
       // Only load content settings from secure origins unless it is a
       // content::MEDIA_OPEN_DEVICE (Pepper) request.
-      if (!IsSchemeSecure() &&
+      if (!IsOriginSecure(request_.security_origin) &&
           request_.request_type != content::MEDIA_OPEN_DEVICE) {
         return false;
       }
@@ -595,11 +596,6 @@ bool MediaStreamDevicesController::IsDefaultMediaAccessBlocked() const {
           == CONTENT_SETTING_BLOCK);
 }
 
-bool MediaStreamDevicesController::IsSchemeSecure() const {
-  return request_.security_origin.SchemeIsSecure() ||
-      request_.security_origin.SchemeIs(extensions::kExtensionScheme);
-}
-
 void MediaStreamDevicesController::StorePermission(bool allowed) const {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   ContentSettingsPattern primary_pattern =