Stop using the MEDIASTREAM content setting.

chrome/browser/media/media_stream_device_permissions.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/media_stream_device_permissions.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 17 matching lines @@
   const user_manager::UserManager* user_manager =
       user_manager::UserManager::Get();
   return user_manager && user_manager->IsLoggedInAsKioskApp();
 #else
   return false;
 #endif
 }
 
 }  // namespace
 
 bool CheckAllowAllMediaStreamContentForOrigin(Profile* profile,

[markusheintz_, 2015/03/06 16:05:33]

Do we actually need this method anymore? Seems like one step of indirection we
could get rid of.

[msramek, 2015/03/06 17:47:33]

Not really, no. I just didn't want to introduce or remove any layers to make
this CL more readable. Basically, so that all replacements are context-free.

Do you mind if I leave this kind of cleanup for a follow-up CL?

-                                              const GURL& security_origin) {
-  // TODO(markusheintz): Replace CONTENT_SETTINGS_TYPE_MEDIA_STREAM with the
-  // appropriate new CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC and
-  // CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA.
+                                              const GURL& security_origin,
+                                              ContentSettingsType type) {
+  DCHECK(type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
+         type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
   return profile->GetHostContentSettingsMap()->ShouldAllowAllContent(
-      security_origin, security_origin, CONTENT_SETTINGS_TYPE_MEDIASTREAM);
+      security_origin, security_origin, type);
 }
 
 MediaStreamDevicePolicy GetDevicePolicy(Profile* profile,
                                         const GURL& security_origin,
                                         const char* policy_name,
                                         const char* whitelist_policy_name) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   // If the security origin policy matches a value in the whitelist, allow it.
   // Otherwise, check the |policy_name| master switch for the default behavior.
@@ skipping 23 matching lines @@
 
   // If a match was not found, check if audio capture is otherwise disallowed
   // or if the user should be prompted.  Setting the policy value to "true"
   // is equal to not setting it at all, so from hereon out, we will return
   // either POLICY_NOT_SET (prompt) or ALWAYS_DENY (no prompt, no access).
   if (!prefs->GetBoolean(policy_name))
     return ALWAYS_DENY;
 
   return POLICY_NOT_SET;
 }