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

chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java

Index: chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java
index 647f2d41fbd07999586d5df2f656c78d9185a7ec..27cf36434194d19856bc99d5034259211f565ece 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java
@@ -26,8 +26,8 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.favicon.FaviconHelper;
 import org.chromium.chrome.browser.favicon.FaviconHelper.FaviconImageCallback;
-import org.chromium.chrome.browser.navigation.NavigationHandler;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.content_public.browser.NavigationController;
 import org.chromium.content_public.browser.NavigationEntry;
 import org.chromium.content_public.browser.NavigationHistory;
 import org.chromium.ui.base.LocalizationUtils;
@@ -44,7 +44,7 @@ public class NavigationPopup extends ListPopupWindow implements AdapterView.OnIt
 
     private final Profile mProfile;
     private final Context mContext;
-    private final NavigationHandler mNavigationHandler;
+    private final NavigationController mNavigationController;
     private final NavigationHistory mHistory;
     private final NavigationAdapter mAdapter;
     private final ListItemFactory mListItemFactory;
@@ -69,12 +69,12 @@ public class NavigationPopup extends ListPopupWindow implements AdapterView.OnIt
      * @param isForward Whether to request forward navigation entries.
      */
     public NavigationPopup(Profile profile, Context context,
-            NavigationHandler navigationController, boolean isForward) {
+            NavigationController navigationController, boolean isForward) {
         super(context, null, android.R.attr.popupMenuStyle);
         mProfile = profile;
         mContext = context;
-        mNavigationHandler = navigationController;
-        mHistory = mNavigationHandler.getDirectedNavigationHistory(
+        mNavigationController = navigationController;
+        mHistory = mNavigationController.getDirectedNavigationHistory(
                 isForward, MAXIMUM_HISTORY_ITEMS);
         mAdapter = new NavigationAdapter();
 
@@ -166,7 +166,7 @@ public class NavigationPopup extends ListPopupWindow implements AdapterView.OnIt
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         NavigationEntry entry = (NavigationEntry) parent.getItemAtPosition(position);
-        mNavigationHandler.goToNavigationIndex(entry.getIndex());
+        mNavigationController.goToNavigationIndex(entry.getIndex());
         dismiss();
     }