Ntp: restore scroll position.

content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java

Index: content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java
index e86aa1a8c44f8873d00c1e4eb45641a79d5c49da..e04f57cbc7812e35ec536396f07bf9a8288cb954 100644
--- a/content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java
@@ -284,15 +284,24 @@ import org.chromium.content_public.common.ResourceRequestBody;
                 replaceEntry);
     }
 
+    @Override
+    public void setEntryExtraData(int index, String key, String value) {
+        if (mNativeNavigationControllerAndroid == 0) return;
+        nativeSetEntryExtraData(mNativeNavigationControllerAndroid, index, key, value);
+    }
+
     @CalledByNative
     private static void addToNavigationHistory(Object history, Object navigationEntry) {
         ((NavigationHistory) history).addEntry((NavigationEntry) navigationEntry);
     }
 
     @CalledByNative
-    private static NavigationEntry createNavigationEntry(int index, String url,
-            String virtualUrl, String originalUrl, String title, Bitmap favicon, int transition) {
-        return new NavigationEntry(index, url, virtualUrl, originalUrl, title, favicon, transition);
+    private static NavigationEntry createNavigationEntry(int index, String url, String virtualUrl,
+            String originalUrl, String title, Bitmap favicon, int transition,
+            String[] extraDataKeys, String[] extraDataValues) {
+        assert extraDataKeys.length == extraDataValues.length;
+        return new NavigationEntry(index, url, virtualUrl, originalUrl, title, favicon, transition,
+                extraDataKeys, extraDataValues);
     }
 
     private native boolean nativeCanGoBack(long nativeNavigationControllerAndroid);
@@ -347,4 +356,6 @@ import org.chromium.content_public.common.ResourceRequestBody;
             long sourceNavigationControllerAndroid);
     private native void nativeCopyStateFromAndPrune(long nativeNavigationControllerAndroid,
             long sourceNavigationControllerAndroid, boolean replaceEntry);
+    private native void nativeSetEntryExtraData(
+            long nativeNavigationControllerAndroid, int index, String key, String value);
 }