Upstream ContentView contentDescription

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index 34cc48f66f00fd70ba91992cf07cc4b26cfc35ff..57ee6cb2739ec87a21ed97594e84afb005c15999 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -23,6 +23,7 @@ import android.webkit.DownloadListener;
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.base.WeakContext;
+import org.chromium.content.app.AppResource;
 import org.chromium.content.browser.ContentViewGestureHandler;
 import org.chromium.content.browser.TouchPoint;
 import org.chromium.content.browser.ZoomManager;
@@ -280,6 +281,15 @@ public class ContentViewCore implements MotionEventDelegate {
         }
         mContainerView.setClickable(true);
 
+        String contentDescription = "Web View";
+        if (AppResource.STRING_CONTENT_VIEW_CONTENT_DESCRIPTION == 0) {
+            Log.w(TAG, "Setting contentDescription to 'Web View' as no value was specified.");
+        } else {
+            contentDescription = mContext.getResources().getString(
+                    AppResource.STRING_CONTENT_VIEW_CONTENT_DESCRIPTION);
+        }
+        mContainerView.setContentDescription(contentDescription);
+
         mZoomManager = new ZoomManager(context, this);
         mZoomManager.updateMultiTouchSupport();
         mContentViewGestureHandler = new ContentViewGestureHandler(context, this, mZoomManager);