Decouple MediaStreamInfoBarDelegate from GroupedPermissionInfoBarDelegate

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

Index: chrome/browser/ui/android/infobars/permission_infobar.cc
diff --git a/chrome/browser/ui/android/infobars/permission_infobar.cc b/chrome/browser/ui/android/infobars/permission_infobar.cc
index fa7f166a1468279709285138c569b5bca16bcbbd..45b8c0e5f75eaa8c7104bbbbacc08116800e3ce7 100644
--- a/chrome/browser/ui/android/infobars/permission_infobar.cc
+++ b/chrome/browser/ui/android/infobars/permission_infobar.cc
@@ -11,6 +11,7 @@
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/memory/ptr_util.h"
+#include "chrome/browser/media/webrtc/media_stream_infobar_delegate_android.h"

[dominickn, 2016/09/20 08:01:36]

Nit: is this needed here?

[lshang, 2016/09/21 03:47:40]

Done.

 #include "chrome/browser/permissions/permission_infobar_delegate.h"
 #include "chrome/browser/ui/android/infobars/confirm_infobar.h"
 #include "components/content_settings/core/common/content_settings_types.h"
@@ -55,7 +56,7 @@ ScopedJavaLocalRef<jobject> PermissionInfoBar::CreateRenderInfoBar(
     java_bitmap = gfx::ConvertToJavaBitmap(delegate->GetIcon().ToSkBitmap());
   }
 
-  std::vector<int> content_settings{delegate->content_setting()};
+  std::vector<int> content_settings(delegate->content_setting());

[dominickn, 2016/09/20 08:01:36]

Nit: this change isn't needed? If you revert both of them here you don't need to
change this file at all in this CL?

[lshang, 2016/09/21 03:47:40]

Done. Only change the method name here.

 
   return Java_PermissionInfoBar_create(
       env, GetWindowAndroid().obj(), GetEnumeratedIconId(), java_bitmap.obj(),