Add logic to resolve permission mismatches in Android M for webrtc.

chrome/browser/media/media_stream_devices_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
 #define CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 16 matching lines @@
  public:
   MediaStreamDevicesController(content::WebContents* web_contents,
                                const content::MediaStreamRequest& request,
                                const content::MediaResponseCallback& callback);
 
   ~MediaStreamDevicesController() override;
 
   // Registers the prefs backing the audio and video policies.
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
-  // Public methods to be called by MediaStreamInfoBarDelegate;
+  bool IsAllowedForAudio() const;
+  bool IsAllowedForVideo() const;
   bool IsAskingForAudio() const;
   bool IsAskingForVideo() const;
   const std::string& GetSecurityOriginSpec() const;
 
+  // Forces the permissions to be denied (without being persisted) regardless
+  // of what the previous state was.  If the user had previously allowed the
+  // site video or audio access, this ignores that and informs the site it was
+  // denied.
+  //
+  // This differs from PermissionGranted/PermissionDenied as they only operate
+  // on the permissions if they are in the ASK state.
+  void ForcePermissionDeniedTemporarily();
+
   // PermissionBubbleRequest:
   int GetIconId() const override;
   base::string16 GetMessageText() const override;
   base::string16 GetMessageTextFragment() const override;
   bool HasUserGesture() const override;
   GURL GetRequestingHostname() const override;
   void PermissionGranted() override;
   void PermissionDenied() override;
   void Cancelled() override;
   void RequestFinished() override;
@@ skipping 55 matching lines @@
   // was created.
   TabSpecificContentSettings* content_settings_;
 
   // The original request for access to devices.
   const content::MediaStreamRequest request_;
 
   // The callback that needs to be Run to notify WebRTC of whether access to
   // audio/video devices was granted or not.
   content::MediaResponseCallback callback_;
 
+  // Whether the permissions granted or denied by the user should be persisted.
+  bool persist_permission_changes_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_