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

chrome/android/java/src/org/chromium/chrome/browser/SwipeRefreshHandler.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;
 
 import android.content.Context;
 import android.view.ViewGroup.LayoutParams;
 
 import org.chromium.base.TraceEvent;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.navigation.NavigationHandler;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.OverscrollRefreshHandler;
 import org.chromium.third_party.android.swiperefresh.SwipeRefreshLayout;
 
 /**
  * An overscroll handler implemented in terms a modified version of the Android
  * compat library's SwipeRefreshLayout effect.
  */
 @JNINamespace("content")
 public class SwipeRefreshHandler implements OverscrollRefreshHandler {
@@ skipping 38 matching lines @@
         // SwipeRefreshLayout.LARGE layouts appear broken on JellyBean.
         mSwipeRefreshLayout.setSize(SwipeRefreshLayout.DEFAULT);
         mSwipeRefreshLayout.setEnabled(false);
     }
 
     /**
      * Pair the effect with a given ContentViewCore instance. If that instance is null,
      * the effect will be disabled.
      * @param contentViewCore The associated ContentViewCore instance.
      */
-    public void setContentViewCore(final ContentViewCore contentViewCore,
-            final NavigationHandler navigationHandler) {
+    public void setContentViewCore(final ContentViewCore contentViewCore) {
         if (mContentViewCore == contentViewCore) return;
 
         if (mContentViewCore != null) {
             setEnabled(false);
             cancelStopRefreshingRunnable();
             mSwipeRefreshLayout.setOnRefreshListener(null);
             mContentViewCore.setOverscrollRefreshHandler(null);
         }
 
         mContentViewCore = contentViewCore;
 
         if (mContentViewCore == null) return;
 
         setEnabled(true);
         mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
                 cancelStopRefreshingRunnable();
                 mSwipeRefreshLayout.postDelayed(
                         getStopRefreshingRunnable(), MAX_REFRESH_ANIMATION_DURATION_MS);
                 if (mAccessibilityRefreshString == null) {
                     int resId = R.string.accessibility_swipe_refresh;
                     mAccessibilityRefreshString =
                             contentViewCore.getContext().getResources().getString(resId);
                 }
                 mSwipeRefreshLayout.announceForAccessibility(mAccessibilityRefreshString);
-                navigationHandler.reloadToRefreshContent(true);
+                contentViewCore.getWebContents().getNavigationController().reloadToRefreshContent(
+                        true);
                 RecordUserAction.record("MobilePullGestureReload");
             }
         });
         mSwipeRefreshLayout.setOnResetListener(new SwipeRefreshLayout.OnResetListener() {
             @Override
             public void onReset() {
                 if (mDetachLayoutRunnable != null) return;
                 mDetachLayoutRunnable = new Runnable() {
                     @Override
                     public void run() {
@@ skipping 88 matching lines @@
     }
 
     private void detachSwipeRefreshLayoutIfNecessary() {
         cancelDetachLayoutRunnable();
         if (mContentViewCore == null) return;
         if (mSwipeRefreshLayout.getParent() != null) {
             mContentViewCore.getContainerView().removeView(mSwipeRefreshLayout);
         }
     }
 }