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

chrome/browser/media/media_stream_devices_controller.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.
 
 #include "chrome/browser/media/media_stream_devices_controller.h"
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/media_stream_capture_indicator.h"
 #include "chrome/browser/media/media_stream_device_permissions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/origin_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #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 "extensions/common/constants.h"
@@ skipping 347 matching lines @@
         // Do nothing.
         NOTREACHED();
         break;
       }
     }  // switch
 
     // TODO(raymes): We currently set the content permission for non-https
     // 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);
       }
     }
 
     if (audio_allowed) {
       profile_->GetHostContentSettingsMap()->UpdateLastUsageByPattern(
           ContentSettingsPattern::FromURLNoWildcard(request_.security_origin),
           ContentSettingsPattern::Wildcard(),
           CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
@@ skipping 68 matching lines @@
 bool MediaStreamDevicesController::HasUserGesture() const {
   return request_.user_gesture;
 }
 
 GURL MediaStreamDevicesController::GetRequestingHostname() const {
   return request_.security_origin;
 }
 
 void MediaStreamDevicesController::PermissionGranted() {
   GURL origin(GetSecurityOriginSpec());
-  if (origin.SchemeIsSecure()) {
+  if (IsOriginSecure(origin)) {
     UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions",
                               kAllowHttps, kPermissionActionsMax);
   } else {
     UMA_HISTOGRAM_ENUMERATION("Media.DevicePermissionActions",
                               kAllowHttp, kPermissionActionsMax);
   }
   Accept(true);
 }
 
 void MediaStreamDevicesController::PermissionDenied() {
@@ skipping 45 matching lines @@
                         request_.security_origin,
                         device_checks[i].policy_name,
                         device_checks[i].list_policy_name);
 
     if (policy == ALWAYS_DENY)
       return false;
 
     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;
       }
       if (profile_->GetHostContentSettingsMap()->GetContentSetting(
               request_.security_origin,
               request_.security_origin,
               device_checks[i].settings_type,
               content_settings::ResourceIdentifier()) !=
           CONTENT_SETTING_ALLOW) {
         return false;
@@ skipping 43 matching lines @@
 bool MediaStreamDevicesController::IsDefaultMediaAccessBlocked() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return (profile_->GetHostContentSettingsMap()->GetDefaultContentSetting(
               CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, NULL)
           == CONTENT_SETTING_BLOCK &&
           profile_->GetHostContentSettingsMap()->GetDefaultContentSetting(
               CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, NULL)
           == 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(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ContentSettingsPattern primary_pattern =
       ContentSettingsPattern::FromURLNoWildcard(request_.security_origin);
   // Check the pattern is valid or not. When the request is from a file access,
   // no exception will be made.
   if (!primary_pattern.IsValid())
     return;
 
   ContentSetting content_setting = allowed ?
@@ skipping 64 matching lines @@
 }
 
 bool MediaStreamDevicesController::IsCaptureDeviceRequestAllowed() const {
 #if defined(OS_ANDROID)
   // Don't approve device requests if the tab was hidden.
   // TODO(qinmin): Add a test for this. http://crbug.com/396869.
   return web_contents_->GetRenderWidgetHostView()->IsShowing();
 #endif
   return true;
 }