Remove IsUserAcceptAllowed check from storing media permission decision

chrome/browser/media/webrtc/media_stream_devices_controller.cc

 // Copyright (c) 2012 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/webrtc/media_stream_devices_controller.h"
 
 #include <map>
 #include <utility>
 
 #include "base/callback_helpers.h"
@@ skipping 728 matching lines @@
   return permission.GetPermissionStatus(denial_reason);
 }
 
 ContentSetting MediaStreamDevicesController::GetNewSetting(
     ContentSettingsType content_type,
     ContentSetting old_setting,
     ContentSetting user_decision) const {
   DCHECK(user_decision == CONTENT_SETTING_ALLOW ||
          user_decision == CONTENT_SETTING_BLOCK);
   ContentSetting result = old_setting;
-  if (old_setting == CONTENT_SETTING_ASK) {
-    if (user_decision == CONTENT_SETTING_ALLOW &&
-        IsUserAcceptAllowed(content_type)) {
-      result = CONTENT_SETTING_ALLOW;
-    } else if (user_decision == CONTENT_SETTING_BLOCK) {
-      result = CONTENT_SETTING_BLOCK;
-    }
-  }
+  if (old_setting == CONTENT_SETTING_ASK)
+    result = user_decision;
   return result;
 }
 
 bool MediaStreamDevicesController::IsUserAcceptAllowed(
     ContentSettingsType content_type) const {
 #if defined(OS_ANDROID)
   content::ContentViewCore* cvc =
       content::ContentViewCore::FromWebContents(web_contents_);
   if (!cvc)
     return false;
@@ skipping 12 matching lines @@
     }
   }
 
   // Don't approve device requests if the tab was hidden.
   // TODO(qinmin): Add a test for this. http://crbug.com/396869.
   // TODO(raymes): Shouldn't this apply to all permissions not just audio/video?
   return web_contents_->GetRenderWidgetHostView()->IsShowing();
 #endif
   return true;
 }