Add initial support for runtime permissions in android M.

chrome/browser/ui/android/infobars/confirm_infobar.cc

Index: chrome/browser/ui/android/infobars/confirm_infobar.cc
diff --git a/chrome/browser/ui/android/infobars/confirm_infobar.cc b/chrome/browser/ui/android/infobars/confirm_infobar.cc
index 149e0de1dc687713613283a2b2be65c55bfbe765..17b72c1031fa1a4fda64aec5a138ec81d7a6455d 100644
--- a/chrome/browser/ui/android/infobars/confirm_infobar.cc
+++ b/chrome/browser/ui/android/infobars/confirm_infobar.cc
@@ -4,13 +4,22 @@
 
 #include "chrome/browser/ui/android/infobars/confirm_infobar.h"
 
+#include <vector>
+
 #include "base/android/jni_android.h"
+#include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "chrome/browser/android/resource_mapper.h"
+#include "chrome/browser/content_settings/permission_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/media/media_stream_infobar_delegate.h"
+#include "components/content_settings/core/common/content_settings_types.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
+#include "content/public/browser/android/content_view_core.h"
+#include "content/public/browser/web_contents.h"
 #include "jni/ConfirmInfoBarDelegate_jni.h"
+#include "ui/android/window_android.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/image/image.h"
 
@@ -53,10 +62,37 @@ base::android::ScopedJavaLocalRef<jobject> ConfirmInfoBar::CreateRenderInfoBar(
     java_bitmap = gfx::ConvertToJavaBitmap(delegate->GetIcon().ToSkBitmap());
   }
 
+  std::vector<int> content_settings;
+  if (delegate->AsPermissionInfobarDelegate()) {
+    content_settings.push_back(
+        delegate->AsPermissionInfobarDelegate()->content_setting());
+  } else if (delegate->AsMediaStreamInfoBarDelegate()) {
+    MediaStreamInfoBarDelegate* media_delegate =
+        delegate->AsMediaStreamInfoBarDelegate();
+    if (media_delegate->IsRequestingVideoAccess()) {
+      content_settings.push_back(
+          ContentSettingsType::CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
+    } else if (media_delegate->IsRequestingMicrophoneAccess()) {
+      content_settings.push_back(
+          ContentSettingsType::CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
+    }
+  }
+
+  content::WebContents* web_contents =
+      InfoBarService::WebContentsFromInfoBar(this);
+  DCHECK(web_contents);

[Bernhard Bauer, 2015/06/05 08:34:04]

These DCHECKs aren't necessary: if |web_contents| or |cvc| is null, you will
crash below anyway.

[Peter Kasting, 2015/06/05 10:33:53]

True, but the DCHECKs do serve as documentation to the reader that these must be
non-null and thus, if there _is_ a crash, the fix is not to add a null-check but
rather to fix the reason they were null.

Or at least that's the way I use and read DCHECKs... perhaps not everyone does.

(It's possible it doesn't matter; maybe in this case the same semantic content
is already obvious by inspection.)

[Bernhard Bauer, 2015/06/05 14:26:38]

In practice what I've seen more often is that the assumption that the web
contents cannot be null turns out to be false, so an early return is added.

I do see your point though -- Ted, if you want to keep the DCHECKs for the
reasons Peter outlined, I won't object.

[Ted C, 2015/06/05 16:35:30]

I personally prefer to keep them.  In addition to what Peter said, I find they
make diagnosing developer
fails much clearer (without having to see what version of code they belonged to,
etc...).  Granted CHECKs
are actually better for that in the wild and these are justifiably checkable
conditions since they'll fail anyway
the line below as pointed out.

+  content::ContentViewCore* cvc =
+      content::ContentViewCore::FromWebContents(web_contents);
+  DCHECK(cvc);
+  base::android::ScopedJavaLocalRef<jobject> jwindow_android =
+      cvc->GetWindowAndroid()->GetJavaObject();
+
   return Java_ConfirmInfoBarDelegate_showConfirmInfoBar(
       env, java_confirm_delegate_.obj(), reinterpret_cast<intptr_t>(this),
-      GetEnumeratedIconId(), java_bitmap.obj(), message_text.obj(),
-      link_text.obj(), ok_button_text.obj(), cancel_button_text.obj());
+      jwindow_android.obj(), GetEnumeratedIconId(), java_bitmap.obj(),
+      message_text.obj(), link_text.obj(), ok_button_text.obj(),
+      cancel_button_text.obj(),
+      base::android::ToJavaIntArray(env, content_settings).obj());
 }
 
 void ConfirmInfoBar::OnLinkClicked(JNIEnv* env, jobject obj) {