Hooking up setBackgroundColor from AwContents to render process

android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java b/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
index 512184d1a9848ec896df0db26078fb328b8c8e44..cd85ef52fc81df7036d428b513263a8e375187e0 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
@@ -4,6 +4,7 @@
 
 package org.chromium.android_webview.test;
 
+import android.graphics.Picture;
 import android.webkit.ConsoleMessage;
 
 import org.chromium.content.browser.test.util.CallbackHelper;
@@ -20,6 +21,7 @@ class TestAwContentsClient extends NullContentsClient {
     private final OnEvaluateJavaScriptResultHelper mOnEvaluateJavaScriptResultHelper;
     private final AddMessageToConsoleHelper mAddMessageToConsoleHelper;
     private final OnScaleChangedHelper mOnScaleChangedHelper;
+    private final PictureListenerHelper mPictureListenerHelper;
 
     public TestAwContentsClient() {
         mOnPageStartedHelper = new OnPageStartedHelper();
@@ -28,6 +30,7 @@ class TestAwContentsClient extends NullContentsClient {
         mOnEvaluateJavaScriptResultHelper = new OnEvaluateJavaScriptResultHelper();
         mAddMessageToConsoleHelper = new AddMessageToConsoleHelper();
         mOnScaleChangedHelper = new OnScaleChangedHelper();
+        mPictureListenerHelper = new PictureListenerHelper();
     }
 
     public OnPageStartedHelper getOnPageStartedHelper() {
@@ -68,6 +71,10 @@ class TestAwContentsClient extends NullContentsClient {
         return mOnScaleChangedHelper;
     }
 
+    public PictureListenerHelper getPictureListenerHelper() {
+        return mPictureListenerHelper;
+    }
+
     @Override
     public void onReceivedTitle(String title) {
         mUpdatedTitle = title;
@@ -138,4 +145,24 @@ class TestAwContentsClient extends NullContentsClient {
     public void onScaleChangedScaled(float oldScale, float newScale) {
         mOnScaleChangedHelper.notifyCalled(oldScale, newScale);
     }
+
+    public static class PictureListenerHelper extends CallbackHelper {
+        // Generally null, depending on |invalidationOnly| in enableOnNewPicture()
+        private Picture mPicture;
+
+        public Picture getPicture() {
+            assert getCallCount() > 0;
+            return mPicture;
+        }
+
+        void notifyCalled(Picture picture) {
+            mPicture = picture;
+            notifyCalled();
+        }
+    }
+
+    @Override
+    public void onNewPicture(Picture picture) {
+        mPictureListenerHelper.notifyCalled(picture);
+    }
 }