Revert 179093

chrome/browser/content_settings/tab_specific_content_settings.cc

Index: chrome/browser/content_settings/tab_specific_content_settings.cc
===================================================================
--- chrome/browser/content_settings/tab_specific_content_settings.cc	(revision 179367)
+++ chrome/browser/content_settings/tab_specific_content_settings.cc	(working copy)
@@ -206,8 +206,7 @@
       content_type == CONTENT_SETTINGS_TYPE_PLUGINS ||
       content_type == CONTENT_SETTINGS_TYPE_COOKIES ||
       content_type == CONTENT_SETTINGS_TYPE_POPUPS ||
-      content_type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT ||
-      content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM)
+      content_type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT)
     return content_blocked_[content_type];
 
   return false;
@@ -225,10 +224,8 @@
 
 bool TabSpecificContentSettings::IsContentAccessed(
     ContentSettingsType content_type) const {
-  // This method currently only returns meaningful values for the content type
-  // cookies and mediastream.
-  if (content_type != CONTENT_SETTINGS_TYPE_COOKIES &&
-      content_type != CONTENT_SETTINGS_TYPE_MEDIASTREAM)
+  // This method currently only returns meaningful values for cookies.
+  if (content_type != CONTENT_SETTINGS_TYPE_COOKIES)
     return false;
 
   return content_accessed_[content_type];
@@ -425,10 +422,6 @@
       content::NotificationService::NoDetails());
 }
 
-void TabSpecificContentSettings::OnMediaStreamAccessed() {
-  OnContentAccessed(CONTENT_SETTINGS_TYPE_MEDIASTREAM);
-}
-
 void TabSpecificContentSettings::ClearBlockedContentSettingsExceptForCookies() {
   for (size_t i = 0; i < arraysize(content_blocked_); ++i) {
     if (i == CONTENT_SETTINGS_TYPE_COOKIES)