Revert of Reland: Ntp: restore scroll position.

content/browser/frame_host/navigation_controller_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/navigation_controller_android.h"
 
 #include <stdint.h>
 
 #include "base/android/jni_android.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"
 #include "content/public/browser/ssl_host_state_delegate.h"
 #include "content/public/common/resource_request_body.h"
 #include "jni/NavigationControllerImpl_jni.h"
 #include "net/base/data_url.h"
 #include "ui/gfx/android/java_bitmap.h"
 
 using base::android::AttachCurrentThread;
@@ skipping 391 matching lines @@
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jlong source_navigation_controller_android,
     jboolean replace_entry) {
   navigation_controller_->CopyStateFromAndPrune(
       reinterpret_cast<NavigationControllerAndroid*>(
           source_navigation_controller_android)->navigation_controller_,
       replace_entry);
 }
 
-ScopedJavaLocalRef<jstring> NavigationControllerAndroid::GetEntryExtraData(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& obj,
-    jint index,
-    const JavaParamRef<jstring>& jkey) {
-  if (index < 0 || index >= navigation_controller_->GetEntryCount())
-    return ScopedJavaLocalRef<jstring>();
-
-  std::string key = base::android::ConvertJavaStringToUTF8(env, jkey);
-  base::string16 value;
-  navigation_controller_->GetEntryAtIndex(index)->GetExtraData(key, &value);
-  return ConvertUTF16ToJavaString(env, value);
-}
-
-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