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

chrome/browser/ui/views/website_settings/website_settings_popup_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 141 matching lines @@
   // provide a certificate then |cert_id_| is 0.
   int cert_id_;
 
   // The link to open the help center page that contains more information about
   // the connection status icons.
   views::Link* help_center_link_;
 
   views::View* connection_info_content_;
   views::View* page_info_content_;
 
+  // The URL of the site for which to display site permissions.
+  GURL site_url_;

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

I think you don't use this attribute since you get the URL from the web_contents
in website_settings_popup_view.cc:494

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

Thanks, uncleaned code.

+
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_