Revert 179093

chrome/browser/content_settings/tab_specific_content_settings_unittest.cc

Index: chrome/browser/content_settings/tab_specific_content_settings_unittest.cc
===================================================================
--- chrome/browser/content_settings/tab_specific_content_settings_unittest.cc	(revision 179367)
+++ chrome/browser/content_settings/tab_specific_content_settings_unittest.cc	(working copy)
@@ -68,11 +68,8 @@
       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 mediastream access and block a
-  // popup.
+  // Set a cookie, block access to images, block a popup.
   content_settings->OnCookieChanged(GURL("http://google.com"),
                                     GURL("http://google.com"),
                                     "A=B",
@@ -81,8 +78,6 @@
   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));
@@ -93,8 +88,6 @@
   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",
@@ -122,8 +115,6 @@
       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(
@@ -136,8 +127,6 @@
       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) {
@@ -160,17 +149,12 @@
       TabSpecificContentSettings::FromWebContents(web_contents());
   net::CookieOptions options;
 
-  // Test default settings.
   ASSERT_FALSE(
       content_settings->IsContentAccessed(CONTENT_SETTINGS_TYPE_IMAGES));
   ASSERT_FALSE(
       content_settings->IsContentAccessed(CONTENT_SETTINGS_TYPE_COOKIES));
   ASSERT_FALSE(
       content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
-  ASSERT_FALSE(
-      content_settings->IsContentAccessed(CONTENT_SETTINGS_TYPE_MEDIASTREAM));
-
-  // Record a cookie.
   content_settings->OnCookieChanged(GURL("http://google.com"),
                                     GURL("http://google.com"),
                                     "A=B",
@@ -180,8 +164,6 @@
       content_settings->IsContentAccessed(CONTENT_SETTINGS_TYPE_COOKIES));
   ASSERT_FALSE(
       content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
-
-  // Record a blocked cookie.
   content_settings->OnCookieChanged(GURL("http://google.com"),
                                     GURL("http://google.com"),
                                     "C=D",
@@ -191,21 +173,6 @@
       content_settings->IsContentAccessed(CONTENT_SETTINGS_TYPE_COOKIES));
   ASSERT_TRUE(
       content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
-
-  // Record mediastream access.
-  content_settings->OnMediaStreamAccessed();
-  ASSERT_TRUE(
-      content_settings->IsContentAccessed(CONTENT_SETTINGS_TYPE_MEDIASTREAM));
-  ASSERT_FALSE(
-      content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_MEDIASTREAM));
-
-  // Record a blocked mediastream access request.
-  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) {