Upstream JellyBean Accessibility Support

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

Index: content/public/android/java/src/org/chromium/content/browser/ContentView.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentView.java b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
index 6e796fa7d9d5c02abbc852f88db1d9249bff4987..24aaf9f0975e51784c6d5511ed4102922cd02fdb 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentView.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
@@ -143,8 +143,12 @@ public class ContentView extends FrameLayout implements ContentViewCore.Internal
 
     private static ContentView newInstance(Context context, int nativeWebContents,
             AttributeSet attrs, int defStyle, int personality) {
-        // TODO(dtrainor): Upstream JellyBean version of AccessibilityInjector when SDK is 16.
-        return new ContentView(context, nativeWebContents, attrs, defStyle, personality);
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
+            return new ContentView(context, nativeWebContents, attrs, defStyle, personality);
+        } else {
+            return new JellyBeanContentView(context, nativeWebContents, attrs, defStyle,
+                    personality);
+        }
     }
 
     protected ContentView(Context context, int nativeWebContents, AttributeSet attrs, int defStyle,