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

chrome/browser/permissions/permission_update_infobar_delegate_android.cc

 // 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.
 
 #include "chrome/browser/permissions/permission_update_infobar_delegate_android.h"
 
 #include <string>
 
 #include "base/android/jni_array.h"
+#include "base/callback_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/android/preferences/pref_service_bridge.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/PermissionUpdateInfoBarDelegate_jni.h"
@@ skipping 49 matching lines @@
 }
 
 // static
 bool PermissionUpdateInfoBarDelegate::RegisterPermissionUpdateInfoBarDelegate(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void PermissionUpdateInfoBarDelegate::OnPermissionResult(
     JNIEnv* env, jobject obj, jboolean all_permissions_granted) {
-  callback_.Run(all_permissions_granted);
+  base::ResetAndReturn(&callback_).Run(all_permissions_granted);
   infobar()->RemoveSelf();
 }
 
 PermissionUpdateInfoBarDelegate::PermissionUpdateInfoBarDelegate(
     content::WebContents* web_contents,
     const std::vector<ContentSettingsType>& content_settings_types,
     const PermissionUpdatedCallback& callback)
     : ConfirmInfoBarDelegate(),
       content_settings_types_(content_settings_types),
       callback_(callback) {
   std::vector<int> content_settings_type_values;
   for (ContentSettingsType type : content_settings_types)
     content_settings_type_values.push_back(type);
 
   JNIEnv* env = base::android::AttachCurrentThread();
   java_delegate_.Reset(Java_PermissionUpdateInfoBarDelegate_create(
       env,
       reinterpret_cast<intptr_t>(this),
       web_contents->GetJavaWebContents().obj(),
       base::android::ToJavaIntArray(env, content_settings_type_values).obj()));
 
   content::ContentViewCore* cvc =
         content::ContentViewCore::FromWebContents(web_contents);
   window_android_ = cvc->GetWindowAndroid();
 }
 
 PermissionUpdateInfoBarDelegate::~PermissionUpdateInfoBarDelegate() {
   Java_PermissionUpdateInfoBarDelegate_onNativeDestroyed(
       base::android::AttachCurrentThread(), java_delegate_.obj());
+
+  if (!callback_.is_null())
+    callback_.Run(false);
 }
 
 int PermissionUpdateInfoBarDelegate::GetIconId() const {
   return IDR_INFOBAR_WARNING;
 }
 
 base::string16 PermissionUpdateInfoBarDelegate::GetMessageText() const {
   int missing_permission_count = 0;
   int message_id = IDS_INFOBAR_MISSING_MULTIPLE_PERMISSIONS_TEXT;
 
@@ skipping 41 matching lines @@
   return l10n_util::GetStringUTF16(IDS_INFOBAR_UPDATE_PERMISSIONS_BUTTON_TEXT);
 }
 
 bool PermissionUpdateInfoBarDelegate::Accept() {
   Java_PermissionUpdateInfoBarDelegate_requestPermissions(
       base::android::AttachCurrentThread(), java_delegate_.obj());
   return false;
 }
 
 bool PermissionUpdateInfoBarDelegate::Cancel() {
-  callback_.Run(false);
+  base::ResetAndReturn(&callback_).Run(false);
   return true;
 }
+
+void PermissionUpdateInfoBarDelegate::InfoBarDismissed() {
+  base::ResetAndReturn(&callback_).Run(false);
+}