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

chrome/browser/content_settings/content_settings_pref_provider.cc

Index: chrome/browser/content_settings/content_settings_pref_provider.cc
diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc
index d185dcddf73b178e5a3a794706c5a39e125fff24..8f6f6cd73b52047323014446a274170c62a5ef13 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider.cc
@@ -361,17 +361,31 @@ void PrefProvider::ReadContentSettingsFromPref(bool overwrite) {
           }
         }
       }
-      int setting = CONTENT_SETTING_DEFAULT;
-      if (settings_dictionary->GetIntegerWithoutPathExpansion(
-              GetTypeName(ContentSettingsType(i)), &setting)) {
-        DCHECK_NE(CONTENT_SETTING_DEFAULT, setting);
-        setting = FixObsoleteCookiePromptMode(content_type,
-                                              ContentSetting(setting));
-        value_map_.SetValue(pattern_pair.first,
-                            pattern_pair.second,
-                            content_type,
-                            ResourceIdentifier(""),
-                            Value::CreateIntegerValue(setting));
+      if (content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM) {
+        // MediaStream is using compound type as value.
+        DictionaryValue* setting = NULL;
+        if (settings_dictionary->GetDictionaryWithoutPathExpansion(
+                GetTypeName(ContentSettingsType(i)), &setting)) {
+          DCHECK(!setting->empty());
+          value_map_.SetValue(pattern_pair.first,
+                              pattern_pair.second,
+                              content_type,
+                              ResourceIdentifier(""),
+                              setting);
+        }
+      } else {
+        int setting = CONTENT_SETTING_DEFAULT;
+        if (settings_dictionary->GetIntegerWithoutPathExpansion(
+                GetTypeName(ContentSettingsType(i)), &setting)) {
+          DCHECK_NE(CONTENT_SETTING_DEFAULT, setting);
+          setting = FixObsoleteCookiePromptMode(content_type,
+                                                ContentSetting(setting));
+          value_map_.SetValue(pattern_pair.first,
+                              pattern_pair.second,
+                              content_type,
+                              ResourceIdentifier(""),
+                              Value::CreateIntegerValue(setting));
+        }
       }
     }
   }