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

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.java

 // Copyright 2015 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.toolbar;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.annotation.SuppressLint;
@@ skipping 247 matching lines @@
         // Ensure the the popup is not shown after resuming activity from background.
         if (hasWindowFocus && mNavigationPopup != null) {
             mNavigationPopup.dismiss();
             mNavigationPopup = null;
         }
         super.onWindowFocusChanged(hasWindowFocus);
     }
 
     private void displayNavigationPopup(boolean isForward, View anchorView) {
         Tab tab = getToolbarDataProvider().getTab();
-        if (tab == null || tab.getNavigationHandler() == null) return;
-        mNavigationPopup = new NavigationPopup(
-                tab.getProfile(), getContext(), tab.getNavigationHandler(), isForward);
+        if (tab == null || tab.getWebContents() == null) return;
+        mNavigationPopup = new NavigationPopup(tab.getProfile(), getContext(),
+                tab.getWebContents().getNavigationController(), isForward);
 
         mNavigationPopup.setAnchorView(anchorView);
 
         int menuWidth = getResources().getDimensionPixelSize(R.dimen.menu_width);
         mNavigationPopup.setWidth(menuWidth);
 
         if (mNavigationPopup.shouldBeShown()) mNavigationPopup.show();
     }
 
     @Override
@@ skipping 347 matching lines @@
                 }
 
                 mButtonVisibilityAnimators = null;
             }
         });
 
         return set;
     }
 
 }