[android_webview] Factor AwWebContentsObserver out of AwContentsClient.

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 d96b5e74649244a01cb60442c0d5b7a32b55e413..da69a3956854953847d91febc095c13d3b39732f 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
@@ -29,6 +29,7 @@ public class TestAwContentsClient extends NullContentsClient {
     private final OnScaleChangedHelper mOnScaleChangedHelper;
     private final PictureListenerHelper mPictureListenerHelper;
     private final ShouldOverrideUrlLoadingHelper mShouldOverrideUrlLoadingHelper;
+    private final DoUpdateVisitedHistoryHelper mDoUpdateVisitedHistoryHelper;
 
     public TestAwContentsClient() {
         super(ThreadUtils.getUiThreadLooper());
@@ -42,6 +43,7 @@ public class TestAwContentsClient extends NullContentsClient {
         mOnScaleChangedHelper = new OnScaleChangedHelper();
         mPictureListenerHelper = new PictureListenerHelper();
         mShouldOverrideUrlLoadingHelper = new ShouldOverrideUrlLoadingHelper();
+        mDoUpdateVisitedHistoryHelper = new DoUpdateVisitedHistoryHelper();
     }
 
     public OnPageStartedHelper getOnPageStartedHelper() {
@@ -76,6 +78,10 @@ public class TestAwContentsClient extends NullContentsClient {
         return mAddMessageToConsoleHelper;
     }
 
+    public DoUpdateVisitedHistoryHelper getDoUpdateVisitedHistoryHelper() {
+        return mDoUpdateVisitedHistoryHelper;
+    }
+
     /**
      * Callback helper for onScaleChangedScaled.
      */
@@ -341,4 +347,34 @@ public class TestAwContentsClient extends NullContentsClient {
         mShouldOverrideUrlLoadingHelper.notifyCalled(url);
         return returnValue;
     }
+
+
+    /**
+     * Callback helper for doUpdateVisitedHistory.
+     */
+    public static class DoUpdateVisitedHistoryHelper extends CallbackHelper {
+        String mUrl;
+        boolean mIsReload;
+
+        public String getUrl() {
+            assert getCallCount() > 0;
+            return mUrl;
+        }
+
+        public boolean getIsReload() {
+            assert getCallCount() > 0;
+            return mIsReload;
+        }
+
+        public void notifyCalled(String url, boolean isReload) {
+            mUrl = url;
+            mIsReload = isReload;
+            notifyCalled();
+        }
+    }
+
+    @Override
+    public void doUpdateVisitedHistory(String url, boolean isReload) {
+        getDoUpdateVisitedHistoryHelper().notifyCalled(url, isReload);
+    }
 }