Add an location bar icon and a content settings bubble for media settings.

chrome/browser/content_settings/tab_specific_content_settings_unittest.cc

Index: chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
diff --git a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
index e0bbb45c8282211db3221f53ca4c0182163cd5ba..0deeca81362e6e13723713563aa2c4211d12da7c 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
+++ b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
@@ -68,8 +68,11 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {
       content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
   EXPECT_FALSE(
       content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS));
+  EXPECT_FALSE(
+      content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_MEDIASTREAM));
 
-  // Set a cookie, block access to images, block a popup.
+  // Set a cookie, block access to images, block mediastream access block a

[Bernhard Bauer, 2013/01/22 14:59:08]

Nit: put an "and" before the last item (and maybe an oxford comma before that,
if you feel fancy).

[markusheintz_, 2013/01/23 10:42:30]

Done.

+  // popup.
   content_settings->OnCookieChanged(GURL("http://google.com"),
                                     GURL("http://google.com"),
                                     "A=B",
@@ -78,6 +81,8 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {
   content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES,
                                      std::string());
   content_settings->SetPopupsBlocked(true);
+  content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_MEDIASTREAM,
+                                     std::string());
 
   // Check that only the respective content types are affected.
   EXPECT_TRUE(content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_IMAGES));
@@ -88,6 +93,8 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {
   EXPECT_FALSE(
       content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
   EXPECT_TRUE(content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS));
+  EXPECT_TRUE(
+      content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_MEDIASTREAM));
   content_settings->OnCookieChanged(GURL("http://google.com"),
                                     GURL("http://google.com"),
                                     "A=B",
@@ -115,6 +122,8 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {
       content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
   EXPECT_FALSE(
       content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS));
+  EXPECT_FALSE(
+      content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_MEDIASTREAM));
 
   content_settings->ClearCookieSpecificContentSettings();
   EXPECT_FALSE(
@@ -127,6 +136,8 @@ TEST_F(TabSpecificContentSettingsTest, BlockedContent) {
       content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
   EXPECT_FALSE(
       content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS));
+  EXPECT_FALSE(
+      content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_MEDIASTREAM));
 }
 
 TEST_F(TabSpecificContentSettingsTest, BlockedFileSystems) {
@@ -173,6 +184,20 @@ TEST_F(TabSpecificContentSettingsTest, AllowedContent) {
       content_settings->IsContentAccessed(CONTENT_SETTINGS_TYPE_COOKIES));
   ASSERT_TRUE(
       content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
+
+  ASSERT_FALSE(
+      content_settings->IsContentAccessed(CONTENT_SETTINGS_TYPE_MEDIASTREAM));
+    content_settings->OnMediaStreamAccessed();

[Bernhard Bauer, 2013/01/22 14:59:08]

Nit: indent two spaces less.

It might also make sense to group these lines differently, i.e

<action>
<test>
<another test>

<next action>
<test>
etc.

[markusheintz_, 2013/01/23 10:42:30]

Yeah this makes much sense. I also added a few words.

I think these unittests deserve a bit of of kindness and attention.

+  ASSERT_TRUE(
+      content_settings->IsContentAccessed(CONTENT_SETTINGS_TYPE_MEDIASTREAM));
+  ASSERT_FALSE(
+      content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_MEDIASTREAM));
+  content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_MEDIASTREAM,
+                                     std::string());
+  ASSERT_TRUE(
+      content_settings->IsContentAccessed(CONTENT_SETTINGS_TYPE_MEDIASTREAM));
+  ASSERT_TRUE(
+      content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_MEDIASTREAM));
 }
 
 TEST_F(TabSpecificContentSettingsTest, EmptyCookieList) {