Removing NavigationClient dependencies from Tab.

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 96f6256b7d57857aa6e6452fab745041a66781b5..17b47a924d0f41a2ffdfc229a126eb425a84bf62 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/NavigationPopupTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/NavigationPopupTest.java
@@ -13,9 +13,10 @@ import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.shell.ChromeShellActivity;
 import org.chromium.chrome.shell.ChromeShellTestBase;
-import org.chromium.content.browser.NavigationClient;
 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;
 
@@ -54,7 +55,7 @@ public class NavigationPopupTest extends ChromeShellTestBase {
         }
     }
 
-    private static class TestNavigationClient implements NavigationClient {
+    private static class TestNavigationClient implements NavigationController {

[Ted C, 2014/10/22 17:41:34]

TestNavigationController now

[AKVT, 2014/10/23 13:34:27]

Done.

         private TestNavigationHistory mHistory;
         private int mNavigatedIndex = INVALID_NAVIGATION_INDEX;
 
@@ -67,6 +68,94 @@ public class NavigationPopupTest extends ChromeShellTestBase {
         }
 
         @Override
+        public boolean canGoBack() {
+            return false;
+        }
+
+        @Override
+        public boolean canGoForward() {
+            return false;
+        }
+
+        @Override
+        public boolean canGoToOffset(int offset) {
+            return false;
+        }
+
+        @Override
+        public void goToOffset(int offset) {
+        }
+
+        @Override
+        public void goBack() {
+        }
+
+        @Override
+        public void goForward() {
+        }
+
+        @Override
+        public void loadIfNecessary() {
+        }
+
+        @Override
+        public void requestRestoreLoad() {
+        }
+
+        @Override
+        public void reload(boolean checkForRepost) {
+        }
+
+        @Override
+        public void reloadIgnoringCache(boolean checkForRepost) {
+        }
+
+        @Override
+        public void cancelPendingReload() {
+        }
+
+        @Override
+        public void continuePendingReload() {
+        }
+
+        @Override
+        public void loadUrl(LoadUrlParams params) {
+        }
+
+        @Override
+        public void clearHistory() {
+        }
+
+        @Override
+        public NavigationHistory getNavigationHistory() {
+            return null;
+        }
+
+
+        @Override
+        public String getOriginalUrlForVisibleNavigationEntry() {
+            return null;
+        }
+
+        @Override
+        public void clearSslPreferences() {
+        }
+
+        @Override
+        public boolean getUseDesktopUserAgent() {
+            return false;
+        }
+
+        @Override
+        public void setUseDesktopUserAgent(boolean override, boolean reloadOnChange) {
+        }
+
+        @Override
+        public NavigationEntry getPendingEntry() {
+            return null;
+        }
+
+        @Override
         public NavigationHistory getDirectedNavigationHistory(boolean isForward, int itemLimit) {
             return mHistory;
         }