Refactor ContentViewClient (1/6)

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 0d1ea54d54947c624173cf6cc0260afcd0e58b00..b4799019a9d80ae452471369228ca03249b6d8e1 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
@@ -312,6 +312,7 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
     }
 
     private final Context mContext;
+    private final String mProductVersion;
     private ViewGroup mContainerView;
     private InternalAccessDelegate mContainerViewInternals;
     private WebContents mWebContents;
@@ -477,8 +478,9 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
      *
      * @param context The context used to create this.
      */
-    public ContentViewCore(Context context) {
+    public ContentViewCore(Context context, String productVersion) {
         mContext = context;
+        mProductVersion = productVersion;
         mRenderCoordinates = new RenderCoordinates();
         mJoystickScrollProvider = new JoystickScrollProvider(this);
         mAccessibilityManager = (AccessibilityManager)
@@ -2930,7 +2932,7 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
             @Override
             public void onAccessibilitySnapshot(AccessibilitySnapshotNode root) {
                 viewRoot.setClassName("");
-                viewRoot.setHint(mContentViewClient.getProductVersion());
+                viewRoot.setHint(mProductVersion);
                 if (root == null) {
                     viewRoot.asyncCommit();
                     return;
@@ -3200,15 +3202,6 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
         if (potentiallyActiveFlingCount > 0) updateGestureStateListener(GestureEventType.FLING_END);
     }
 
-    ContentVideoViewEmbedder getContentVideoViewEmbedder() {
-        return getContentViewClient().getContentVideoViewEmbedder();
-    }
-
-    @CalledByNative
-    private boolean shouldBlockMediaRequest(String url) {
-        return getContentViewClient().shouldBlockMediaRequest(url);
-    }
-
     @CalledByNative
     private void onNativeFlingStopped() {
         // Note that mTouchScrollInProgress should normally be false at this