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..333e9b254a04e5d92abfcfe57176b5d51a526cc8 100644
--- a/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/website_settings_bubble_controller.mm
@@ -893,7 +893,13 @@ 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 10:49:04]

Sorry I think I miss some detail. Why do we need this?

Line 877-881 already makes sure that we exclude the allow option.

If the default settings is used, then the |.setting| should be
CONTENT_SETTING_DEFAULT. The permission info has a separate field for the
effective default setting.
If the |.setting| is not default, then we don't use the default setting.

Creating proper permission info objects should be done in
chrome/browser/ui/website_settings/website_settings.cc.

[markusheintz_, 2012/12/14 15:10:04]

Alrigth after discussing this offline via chat I'm ok with this beeing a
temporary change. Please add a comment and a TODO. If we don't have a bug for
this pls create one and cc me. Thanks a lot! :)

+      permissionInfo.setting == CONTENT_SETTING_ALLOW) {
+    // Show the default setting since MEDIASTREAM does not support allow yet.
+    [button selectItemWithTag:CONTENT_SETTING_DEFAULT];
+  } else {
+    [button selectItemWithTag:permissionInfo.setting];
+  }
 
   // Set the button title.
   scoped_nsobject<NSMenuItem> titleItem([[NSMenuItem alloc] init]);
@@ -1120,11 +1126,6 @@ NSColor* IdentityVerifiedTextColor() {
 }
 
 - (void)setPermissionInfo:(const PermissionInfoList&)permissionInfoList {
-  // The contents of the permissions view can cause the whole window to get
-  // bigger, but currently permissions are always set before cookie info.
-  // Check to make sure that's still the case.
-  DCHECK_EQ(0U, [[cookiesView_ subviews] count]);

[markusheintz_, 2012/12/14 10:49:04]

Patrick Dubroy will fix the DCHECK issue and upload a separate CL.

-
   [permissionsView_ setSubviews:[NSArray array]];
   NSPoint controlOrigin = NSMakePoint(kFramePadding, 0);