fixed the DCHECK and also corrected the website setting UI for media

chrome/browser/ui/cocoa/website_settings_bubble_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/website_settings_bubble_controller.h"
 
 #include <cmath>
 
 #import <AppKit/AppKit.h>
 
@@ skipping 854 matching lines @@
   [button setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
   [button setBordered:NO];
   [[button cell] setControlSize:NSSmallControlSize];
   [button setTag:permissionInfo.type];
   [button setAction:@selector(permissionValueChanged:)];
   [button setTarget:self];
 
   // Create the popup menu.
   // TODO(dubroy): Refactor this code to use PermissionMenuModel.
 
-  // Media stream permission does not support "Always allow".
-  // TODO(xians): Media supports "allow" for https but not for http.
-  if (permissionInfo.type != CONTENT_SETTINGS_TYPE_MEDIASTREAM) {
+  bool secure_scheme = webContents_->GetURL().SchemeIsSecure();

[markusheintz_, 2012/12/14 15:46:43]

nit: I think we could inline this.

[no longer working on chromium, 2012/12/14 15:56:19]

this secure_scheme is used in two places, and it is actually better to use a
temp variable to store the bool.

Let me know if you strongly want removing the temp variable, otherwise, I hope
to keep it this way.

[markusheintz_, 2012/12/14 16:12:09]

If we keep using it in two places then ignore this comment. If not that pls
inline.

+  // Media stream permission only support "Always allow" for https.
+  if (permissionInfo.type != CONTENT_SETTINGS_TYPE_MEDIASTREAM ||
+      secure_scheme) {
     [button addItemWithTitle:
         l10n_util::GetNSString(IDS_WEBSITE_SETTINGS_MENU_ITEM_ALLOW)];
     [[button lastItem] setTag:CONTENT_SETTING_ALLOW];
   }
 
   // Fullscreen does not support "Always block".
   if (permissionInfo.type != CONTENT_SETTINGS_TYPE_FULLSCREEN) {
     [button addItemWithTitle:
         l10n_util::GetNSString(IDS_WEBSITE_SETTINGS_MENU_ITEM_BLOCK)];
     [[button lastItem] setTag:CONTENT_SETTING_BLOCK];
   }
 
   [button addItemWithTitle:l10n_util::GetNSStringF(
       IDS_WEBSITE_SETTINGS_DEFAULT_PERMISSION_LABEL,
       WebsiteSettingsUI::PermissionValueToUIString(
           permissionInfo.default_setting))];
   [[button lastItem] setTag:CONTENT_SETTING_DEFAULT];
 
-  [button selectItemWithTag:permissionInfo.setting];
+  if (permissionInfo.type == CONTENT_SETTINGS_TYPE_MEDIASTREAM &&

[markusheintz_, 2012/12/14 15:46:43]

Can  this condition ever be true while the condition in line 877 is false?

[no longer working on chromium, 2012/12/14 15:56:19]

line 877 decides if it will add a "allow" button to the UI.
And here will decide CONTENT_SETTING_DEFAULT item will be checked if the
permission for the http site is "allow".

[markusheintz_, 2012/12/14 16:12:09]

But the permission should never be ALLOW for an http site. It should only be
possible that the permission is CONTENT_SETTING_ALLOW for secure URLs.

The setting is either CONTENT_SETTING_DEFAULT or CONTENT_SETTING_ASK or
CONTENT_SETTING_BLOCK.

Users won't be able to create an allow content setting exception (permission)
for a non https URL using the infobar. The settings page itself also does only
allow users to rm exceptions.

+      !secure_scheme &&
+      permissionInfo.setting == CONTENT_SETTING_ALLOW) {
+    // Select the default setting as the current setting since MEDIASTREAM
+    // does not support allow for http.
+    [button selectItemWithTag:CONTENT_SETTING_DEFAULT];
+  } else {
+    [button selectItemWithTag:permissionInfo.setting];
+  }
 
   // Set the button title.
   scoped_nsobject<NSMenuItem> titleItem([[NSMenuItem alloc] init]);
   string16 buttonTitle = WebsiteSettingsUI::PermissionActionToUIString(
       permissionInfo.setting,
       permissionInfo.default_setting,
       permissionInfo.source);
   [titleItem setTitle:base::SysUTF16ToNSString(buttonTitle)];
   [[button cell] setUsesItemFromMenu:NO];
   [[button cell] setMenuItem:titleItem.get()];
@@ skipping 325 matching lines @@
   [bubble_controller_ setPermissionInfo:permission_info_list];
 }
 
 void WebsiteSettingsUIBridge::SetFirstVisit(const string16& first_visit) {
   [bubble_controller_ setFirstVisit:first_visit];
 }
 
 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
   [bubble_controller_ setSelectedTab:tab_id];
 }