Add support for images with descriptions to infobars

chrome/android/java/res/layout/infobar_control_icon_with_description.xml

Index: chrome/android/java/res/layout/infobar_control_icon_with_description.xml
diff --git a/chrome/android/java/res/layout/infobar_control_icon_with_description.xml b/chrome/android/java/res/layout/infobar_control_icon_with_description.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e231c5b499a1a93d1b66fb3d197c9ac55a813405
--- /dev/null
+++ b/chrome/android/java/res/layout/infobar_control_icon_with_description.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="36dp"
+    android:gravity="center_vertical">
+
+    <ImageView
+        android:id="@+id/control_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/infobar_control_margin_between_items"
+        android:scaleType="centerInside"
+        android:contentDescription="@null" />
+
+    <org.chromium.chrome.browser.infobar.InfoBarDualControlLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" >
+
+        <TextView
+            android:id="@+id/control_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"

[newt (away), 2016/01/05 21:20:53]

This gravity doesn't do anything since height is wrap_content, right? Same for
the TextView below.

[gone, 2016/01/05 21:43:54]

Done.

+            android:textSize="@dimen/infobar_text_size"
+            android:textColor="@color/default_text_color" />
+
+        <TextView
+            android:id="@+id/control_secondary_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:textSize="@dimen/infobar_text_size"
+            android:textColor="@color/infobar_descriptive_text_color" />
+
+    </org.chromium.chrome.browser.infobar.InfoBarDualControlLayout>
+
+</LinearLayout>