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

chrome/browser/ui/cocoa/website_settings_bubble_controller.mm

Index: chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
index ee9d575a15fca276cbf899a9d43178925d621977..663c2790307c4fa9f8820779571e02880836072d 100644
--- a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
@@ -872,9 +872,10 @@ NSColor* IdentityVerifiedTextColor() {
   // 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];
@@ -893,7 +894,15 @@ NSColor* IdentityVerifiedTextColor() {
           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]);