Refactor ContentViewClient (3/6)

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 0886e4cb4effd1259e3271a72fd30b71bcebb808..e82316e453eeae07aa1488bf6528539a4ae189bd 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
@@ -23,6 +23,7 @@ import android.widget.FrameLayout;
 
 import org.chromium.base.Log;
 import org.chromium.base.TraceEvent;
+import org.chromium.ui.base.ViewAndroidDelegate;
 
 /**
  * The containing view for {@link ContentViewCore} that exists in the Android UI hierarchy and
@@ -233,16 +234,16 @@ public class ContentView extends FrameLayout
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        ContentViewClient client = mContentViewCore.getContentViewClient();
+        ViewAndroidDelegate viewDelegate = mContentViewCore.getViewDelegate();
 
         // Allow the ContentViewClient to override the ContentView's width.
-        int desiredWidthMeasureSpec = client.getDesiredWidthMeasureSpec();
+        int desiredWidthMeasureSpec = viewDelegate.getDesiredWidthMeasureSpec();
         if (MeasureSpec.getMode(desiredWidthMeasureSpec) != MeasureSpec.UNSPECIFIED) {
             widthMeasureSpec = desiredWidthMeasureSpec;
         }
 
         // Allow the ContentViewClient to override the ContentView's height.
-        int desiredHeightMeasureSpec = client.getDesiredHeightMeasureSpec();
+        int desiredHeightMeasureSpec = viewDelegate.getDesiredHeightMeasureSpec();
         if (MeasureSpec.getMode(desiredHeightMeasureSpec) != MeasureSpec.UNSPECIFIED) {
             heightMeasureSpec = desiredHeightMeasureSpec;
         }