add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi

chrome/browser/ui/webui/options2/content_settings_handler2.h

Index: chrome/browser/ui/webui/options2/content_settings_handler2.h
diff --git a/chrome/browser/ui/webui/options2/content_settings_handler2.h b/chrome/browser/ui/webui/options2/content_settings_handler2.h
index ddc95b835879c802cefeb7104a3d6df2474e3a33..06ea77b4da98e2527a0487e2219a12ce496f9cc2 100644
--- a/chrome/browser/ui/webui/options2/content_settings_handler2.h
+++ b/chrome/browser/ui/webui/options2/content_settings_handler2.h
@@ -93,6 +93,8 @@ class ContentSettingsHandler : public OptionsPageUIHandler,
   // Clobbers and rebuilds just the Pepper Flash camera and microphone exception
   // table.
   void UpdateFlashCameraMicExceptionsView();
+  // Clobbers and rebuilds just the Media Stream device exception table.
+  void UpdateMediaStreamExceptionsView();
   // Clobbers and rebuilds an exception table that's managed by the host content
   // settings map.
   void UpdateExceptionsViewFromHostContentSettingsMap(ContentSettingsType type);
@@ -101,6 +103,17 @@ class ContentSettingsHandler : public OptionsPageUIHandler,
       ContentSettingsType type);
   // Updates the radio buttons for enabling / disabling handlers.
   void UpdateHandlersEnabledRadios();
+  // Removes one geolocation exception.
+  void RemoveGeolocationException(const ListValue* args, size_t arg_index);
+  // Removes one notification exception.
+  void RemoveNotificationException(const ListValue* args, size_t arg_index);
+  // Removes one Pepper Flash camera and microphone exception.
+  void RemoveFlashCameraMicException(const ListValue* args, size_t arg_index);
+  // Removes one exception of |type| from the host content settings map.
+  void RemoveExceptionFromHostContentSettingsMap(
+      const ListValue* args,
+      size_t arg_index,
+      const ExContentSettingsType& type);
 
   // Callbacks used by the page ------------------------------------------------