Re-hook up surfaceRedrawNeededAsync callback.

chrome/android/junit/src/org/chromium/chrome/browser/compositor/CompositorSurfaceManagerTest.java

 // Copyright 2017 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.
 
 package org.chromium.chrome.browser.compositor;
 
 import android.app.Activity;
 import android.graphics.PixelFormat;
 import android.view.Surface;
 import android.view.SurfaceHolder;
@@ skipping 29 matching lines @@
 
 import java.util.Set;
 
 /**
  * Unit tests for the CompositorSurfaceManager.
  */
 @RunWith(LocalRobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class CompositorSurfaceManagerTest {
     @Mock
-    private SurfaceHolder.Callback mCallback;
+    private CompositorSurfaceManager.SurfaceHolderCallbackTarget mCallback;
 
     private CompositorSurfaceManager mManager;
 
     private FrameLayout mLayout;
 
     /**
      * Implementation of a SurfaceView shadow that provides additional functionality for controlling
      * the state of the underlying (fake) Surface.
      */
     @Implements(SurfaceView.class)
@@ skipping 370 matching lines @@
 
         // When the opaque surface becomes available, we'll get the synthetic destroy for the
         // translucent one that we lost ownership of, and the real create for the opaque one.
         callbackFor(opaque).surfaceCreated(opaque.getHolder());
         assertEquals(2, mLayout.getChildCount());
         verify(mCallback, times(2)).surfaceCreated(opaque.getHolder());
         verify(mCallback, times(1)).surfaceDestroyed(opaque.getHolder());
         verify(mCallback, times(1)).surfaceDestroyed(translucent.getHolder());
     }
 }