[Android WebView] Send WebChromeClient.onReceivedTitle when navigating back

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 d36861232ecdad48f98a113a0a3e01f0cdbe4553..42e9225d06234ab636444a0bec3218f0b07454ff 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
@@ -26,7 +26,6 @@ import java.util.List;
  * AwContentsClient subclass used for testing.
  */
 public class TestAwContentsClient extends NullContentsClient {
-    private String mUpdatedTitle;
     private boolean mAllowSslError;
     private final OnPageStartedHelper mOnPageStartedHelper;
     private final OnPageFinishedHelper mOnPageFinishedHelper;
@@ -40,6 +39,7 @@ public class TestAwContentsClient extends NullContentsClient {
     private final OnEvaluateJavaScriptResultHelper mOnEvaluateJavaScriptResultHelper;
     private final AddMessageToConsoleHelper mAddMessageToConsoleHelper;
     private final OnScaleChangedHelper mOnScaleChangedHelper;
+    private final OnReceivedTitleHelper mOnReceivedTitleHelper;
     private final PictureListenerHelper mPictureListenerHelper;
     private final ShouldOverrideUrlLoadingHelper mShouldOverrideUrlLoadingHelper;
     private final DoUpdateVisitedHistoryHelper mDoUpdateVisitedHistoryHelper;
@@ -59,6 +59,7 @@ public class TestAwContentsClient extends NullContentsClient {
         mOnEvaluateJavaScriptResultHelper = new OnEvaluateJavaScriptResultHelper();
         mAddMessageToConsoleHelper = new AddMessageToConsoleHelper();
         mOnScaleChangedHelper = new OnScaleChangedHelper();
+        mOnReceivedTitleHelper = new OnReceivedTitleHelper();
         mPictureListenerHelper = new PictureListenerHelper();
         mShouldOverrideUrlLoadingHelper = new ShouldOverrideUrlLoadingHelper();
         mDoUpdateVisitedHistoryHelper = new DoUpdateVisitedHistoryHelper();
@@ -156,13 +157,32 @@ public class TestAwContentsClient extends NullContentsClient {
         return mPictureListenerHelper;
     }
 
+    /**
+     * Callback helper for onReceivedTitle.
+     */
+    public static class OnReceivedTitleHelper extends CallbackHelper {
+        private String mTitle;
+
+        public void notifyCalled(String title) {
+            mTitle = title;
+            super.notifyCalled();
+        }
+        public String getTitle() {
+            return mTitle;
+        }
+    }
+
+    public OnReceivedTitleHelper getOnReceivedTitleHelper() {
+        return mOnReceivedTitleHelper;
+    }
+
     @Override
     public void onReceivedTitle(String title) {
-        mUpdatedTitle = title;
+        mOnReceivedTitleHelper.notifyCalled(title);
     }
 
     public String getUpdatedTitle() {
-        return mUpdatedTitle;
+        return mOnReceivedTitleHelper.getTitle();
     }
 
     @Override