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

chrome/browser/permissions/permission_update_infobar_delegate_android.h

 // Copyright 2015 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_PERMISSIONS_PERMISSION_UPDATE_INFOBAR_DELEGATE_ANDROID_H_
 #define CHROME_BROWSER_PERMISSIONS_PERMISSION_UPDATE_INFOBAR_DELEGATE_ANDROID_H_
 
 #include <jni.h>
 #include <vector>
 
@@ skipping 47 matching lines @@
   // PermissionInfoBarDelegate:
   int GetIconId() const override;
   base::string16 GetMessageText() const override;
 
   // ConfirmInfoBarDelegate:
   int GetButtons() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;
   bool Accept() override;
   bool Cancel() override;
 
+  // InfoBarDelegate:
+  void InfoBarDismissed() override;
+
   base::android::ScopedJavaGlobalRef<jobject> java_delegate_;
   std::vector<ContentSettingsType> content_settings_types_;
-  const PermissionUpdatedCallback callback_;
+  PermissionUpdatedCallback callback_;
   ui::WindowAndroid* window_android_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionUpdateInfoBarDelegate);
 };
 
 #endif  // CHROME_BROWSER_PERMISSIONS_PERMISSION_UPDATE_INFOBAR_DELEGATE_ANDROID_H_