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

chrome/browser/ui/website_settings/permission_menu_model.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/ui/website_settings/permission_menu_model.h"
 
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/plugins_field_trial.h"
+#include "content/public/common/origin_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 PermissionMenuModel::PermissionMenuModel(
     const GURL& url,
     const WebsiteSettingsUI::PermissionInfo& info,
     const ChangeCallback& callback)
     : ui::SimpleMenuModel(this), permission_(info), callback_(callback) {
   DCHECK(!callback_.is_null());
   base::string16 label;
 
@@ skipping 31 matching lines @@
 
   // CONTENT_SETTING_ALLOW and CONTENT_SETTING_BLOCK are not allowed for
   // fullscreen or mouse lock on file:// URLs, because there wouldn't be
   // a reasonable origin with which to associate the preference.
   // TODO(estark): Revisit this when crbug.com/455882 is fixed.
   bool is_exclusive_access_on_file =
       (permission_.type == CONTENT_SETTINGS_TYPE_FULLSCREEN ||
        permission_.type == CONTENT_SETTINGS_TYPE_MOUSELOCK) &&
       url.SchemeIsFile();
 
   // Media only support CONTENT_SETTTING_ALLOW for https.

[felt, 2015/05/09 15:14:27]

pls update the comment too

[lgarron, 2015/05/12 01:53:08]

Done.

   if ((permission_.type != CONTENT_SETTINGS_TYPE_MEDIASTREAM ||
-       url.SchemeIsSecure()) &&
+       IsOriginSecure(url)) &&
       !is_exclusive_access_on_file) {
     label = l10n_util::GetStringUTF16(
         IDS_WEBSITE_SETTINGS_MENU_ITEM_ALLOW);
     AddCheckItem(CONTENT_SETTING_ALLOW, label);
   }
 
   if (permission_.type == CONTENT_SETTINGS_TYPE_PLUGINS) {
     label = l10n_util::GetStringUTF16(
         IDS_WEBSITE_SETTINGS_MENU_ITEM_DETECT_IMPORTANT_CONTENT);
     AddCheckItem(CONTENT_SETTING_DETECT_IMPORTANT_CONTENT, label);
@@ skipping 42 matching lines @@
     int command_id,
     ui::Accelerator* accelerator) {
   // Accelerators are not supported.
   return false;
 }
 
 void PermissionMenuModel::ExecuteCommand(int command_id, int event_flags) {
   permission_.setting = static_cast<ContentSetting>(command_id);
   callback_.Run(permission_);
 }