| Index: chrome/browser/media/media_stream_devices_controller.cc
|
| diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc
|
| index e8863dfeecdd5550d09bc6f57a46c312393eef6f..0f08b8c6a39bcea91cab7eb5d8685c0b7edc5773 100644
|
| --- a/chrome/browser/media/media_stream_devices_controller.cc
|
| +++ b/chrome/browser/media/media_stream_devices_controller.cc
|
| @@ -215,16 +215,10 @@ MediaStreamDevicesController::~MediaStreamDevicesController() {
|
| // static
|
| void MediaStreamDevicesController::RegisterProfilePrefs(
|
| user_prefs::PrefRegistrySyncable* prefs) {
|
| - prefs->RegisterBooleanPref(prefs::kVideoCaptureAllowed,
|
| - true,
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - prefs->RegisterBooleanPref(prefs::kAudioCaptureAllowed,
|
| - true,
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - prefs->RegisterListPref(prefs::kVideoCaptureAllowedUrls,
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - prefs->RegisterListPref(prefs::kAudioCaptureAllowedUrls,
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + prefs->RegisterBooleanPref(prefs::kVideoCaptureAllowed, true);
|
| + prefs->RegisterBooleanPref(prefs::kAudioCaptureAllowed, true);
|
| + prefs->RegisterListPref(prefs::kVideoCaptureAllowedUrls);
|
| + prefs->RegisterListPref(prefs::kAudioCaptureAllowedUrls);
|
| }
|
|
|
| // TODO(gbillock): rename? doesn't actually dismiss. More of a 'check profile
|
|
|