Revert of Reland: Ntp: restore scroll position.

chrome/android/javatests/src/org/chromium/chrome/browser/NavigationPopupTest.java

 // 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.
 
 package org.chromium.chrome.browser;
 
 import android.graphics.Bitmap;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ skipping 199 matching lines @@
             return false;
         }
 
         @Override
         public void copyStateFrom(NavigationController source) {
         }
 
         @Override
         public void copyStateFromAndPrune(NavigationController source, boolean replaceEntry) {
         }
-
-        @Override
-        public String getEntryExtraData(int index, String key) {
-            return null;
-        }
-
-        @Override
-        public void setEntryExtraData(int index, String key, String value) {}
     }
 
     @MediumTest
     @Feature({"Navigation"})
     public void testFaviconFetching() throws InterruptedException {
         final TestNavigationController controller = new TestNavigationController();
         final NavigationPopup popup = new NavigationPopup(
                 mProfile, getActivity(), controller, true);
         popup.setWidth(300);
         popup.setHeight(300);
@@ skipping 48 matching lines @@
                 popup.performItemClick(1);
             }
         });
 
         assertFalse("Popup did not hide as expected.", popup.isShowing());
         assertEquals("Popup attempted to navigate to the wrong index", 5,
                 controller.mNavigatedIndex);
     }
 
 }