Revert "Changed NavigationController access to through tab in Java code"

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/NavigationPopupTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/NavigationPopupTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/NavigationPopupTest.java
index 9d225ad66a797ad169cb7e2f469505afe7863e9b..7676b4af49b8c0e535d67c4b8939e1aeb0c6e44c 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/NavigationPopupTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/NavigationPopupTest.java
@@ -11,12 +11,12 @@ import android.test.suitebuilder.annotation.SmallTest;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.UrlUtils;
-import org.chromium.chrome.browser.navigation.NavigationHandler;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.LoadUrlParams;
+import org.chromium.content_public.browser.NavigationController;
 import org.chromium.content_public.browser.NavigationEntry;
 import org.chromium.content_public.browser.NavigationHistory;
 
@@ -65,11 +65,11 @@ public class NavigationPopupTest extends ChromeActivityTestCaseBase<ChromeActivi
         }
     }
 
-    private static class TestNavigationHandler implements NavigationHandler {
+    private static class TestNavigationController implements NavigationController {
         private final TestNavigationHistory mHistory;
         private int mNavigatedIndex = INVALID_NAVIGATION_INDEX;
 
-        public TestNavigationHandler() {
+        public TestNavigationController() {
             mHistory = new TestNavigationHistory();
             mHistory.addEntry(new TestNavigationEntry(
                     1, "about:blank", null, null, "About Blank", null, 0));
@@ -146,6 +146,15 @@ public class NavigationPopupTest extends ChromeActivityTestCaseBase<ChromeActivi
         }
 
         @Override
+        public void clearHistory() {
+        }
+
+        @Override
+        public NavigationHistory getNavigationHistory() {
+            return null;
+        }
+
+        @Override
         public String getOriginalUrlForVisibleNavigationEntry() {
             return null;
         }
@@ -169,6 +178,11 @@ public class NavigationPopupTest extends ChromeActivityTestCaseBase<ChromeActivi
         }
 
         @Override
+        public NavigationEntry getPendingEntry() {
+            return null;
+        }
+
+        @Override
         public NavigationHistory getDirectedNavigationHistory(boolean isForward, int itemLimit) {
             return mHistory;
         }
@@ -187,12 +201,30 @@ public class NavigationPopupTest extends ChromeActivityTestCaseBase<ChromeActivi
         public boolean removeEntryAtIndex(int index) {
             return false;
         }
+
+        @Override
+        public boolean canCopyStateOver() {
+            return false;
+        }
+
+        @Override
+        public boolean canPruneAllButLastCommitted() {
+            return false;
+        }
+
+        @Override
+        public void copyStateFrom(NavigationController source) {
+        }
+
+        @Override
+        public void copyStateFromAndPrune(NavigationController source, boolean replaceEntry) {
+        }
     }
 
     @MediumTest
     @Feature({"Navigation"})
     public void testFaviconFetching() throws InterruptedException {
-        final TestNavigationHandler controller = new TestNavigationHandler();
+        final TestNavigationController controller = new TestNavigationController();
         final NavigationPopup popup = new NavigationPopup(
                 mProfile, getActivity(), controller, true);
         popup.setWidth(300);
@@ -229,7 +261,7 @@ public class NavigationPopupTest extends ChromeActivityTestCaseBase<ChromeActivi
     @SmallTest
     @Feature({"Navigation"})
     public void testItemSelection() {
-        final TestNavigationHandler controller = new TestNavigationHandler();
+        final TestNavigationController controller = new TestNavigationController();
         final NavigationPopup popup =
                 new NavigationPopup(mProfile, getActivity(), controller, true);
         popup.setWidth(300);