Ntp: restore scroll position.

content/browser/frame_host/navigation_controller_android.cc

Index: content/browser/frame_host/navigation_controller_android.cc
diff --git a/content/browser/frame_host/navigation_controller_android.cc b/content/browser/frame_host/navigation_controller_android.cc
index 670343abd6d70cd66b6382fb71165a0b8aa73407..26cdf70b2440f872618c0aeb6cd24c0b3a72406d 100644
--- a/content/browser/frame_host/navigation_controller_android.cc
+++ b/content/browser/frame_host/navigation_controller_android.cc
@@ -7,8 +7,10 @@
 #include <stdint.h>
 
 #include "base/android/jni_android.h"
+#include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/callback.h"
+#include "base/strings/string16.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/public/browser/browser_context.h"
@@ -32,7 +34,7 @@ namespace {
 // static
 static base::android::ScopedJavaLocalRef<jobject> CreateJavaNavigationEntry(
     JNIEnv* env,
-    content::NavigationEntry* entry,
+    content::NavigationEntryImpl* entry,
     int index) {
   DCHECK(entry);
 
@@ -50,14 +52,25 @@ static base::android::ScopedJavaLocalRef<jobject> CreateJavaNavigationEntry(
   if (status.valid && status.image.ToSkBitmap()->getSize() > 0)
     j_bitmap = gfx::ConvertToJavaBitmap(status.image.ToSkBitmap());
 
+  std::vector<std::string> extra_data_keys;
+  std::vector<base::string16> extra_data_values;
+  for (const auto& pair : entry->get_extra_data()) {
+    extra_data_keys.push_back(pair.first);
+    extra_data_values.push_back(pair.second);
+  }
+  ScopedJavaLocalRef<jobjectArray> j_extra_data_keys(
+      base::android::ToJavaArrayOfStrings(env, extra_data_keys));
+  ScopedJavaLocalRef<jobjectArray> j_extra_data_values(
+      base::android::ToJavaArrayOfStrings(env, extra_data_values));
+
   return content::Java_NavigationControllerImpl_createNavigationEntry(
       env, index, j_url, j_virtual_url, j_original_url, j_title, j_bitmap,
-      entry->GetTransitionType());
+      entry->GetTransitionType(), j_extra_data_keys, j_extra_data_values);
 }
 
 static void AddNavigationEntryToHistory(JNIEnv* env,
                                         const JavaRef<jobject>& history,
-                                        content::NavigationEntry* entry,
+                                        content::NavigationEntryImpl* entry,
                                         int index) {
   content::Java_NavigationControllerImpl_addToNavigationHistory(
       env, history, CreateJavaNavigationEntry(env, entry, index));
@@ -357,15 +370,15 @@ NavigationControllerAndroid::GetEntryAtIndex(JNIEnv* env,
   if (index < 0 || index >= navigation_controller_->GetEntryCount())
     return base::android::ScopedJavaLocalRef<jobject>();
 
-  content::NavigationEntry* entry =
-      navigation_controller_->GetEntryAtIndex(index);
-  return CreateJavaNavigationEntry(env, entry, index);
+  return CreateJavaNavigationEntry(
+      env, navigation_controller_->GetEntryAtIndex(index), index);
 }
 
 base::android::ScopedJavaLocalRef<jobject>
 NavigationControllerAndroid::GetPendingEntry(JNIEnv* env,
                                              const JavaParamRef<jobject>& obj) {
-  content::NavigationEntry* entry = navigation_controller_->GetPendingEntry();
+  content::NavigationEntryImpl* entry =
+      navigation_controller_->GetPendingEntry();
 
   if (!entry)
     return base::android::ScopedJavaLocalRef<jobject>();
@@ -420,4 +433,18 @@ void NavigationControllerAndroid::CopyStateFromAndPrune(
       replace_entry);
 }
 
+void NavigationControllerAndroid::SetEntryExtraData(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    jint index,
+    const JavaParamRef<jstring>& jkey,
+    const JavaParamRef<jstring>& jvalue) {
+  if (index < 0 || index >= navigation_controller_->GetEntryCount())
+    return;
+
+  std::string key = base::android::ConvertJavaStringToUTF8(env, jkey);
+  base::string16 value = base::android::ConvertJavaStringToUTF16(env, jvalue);
+  navigation_controller_->GetEntryAtIndex(index)->SetExtraData(key, value);
+}
+
 }  // namespace content