Restructuring NavigationController functionalities from ContentViewCore to NavigationController

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

 // Copyright 2013 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.graphics.Bitmap;
 import android.test.suitebuilder.annotation.MediumTest;
 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.shell.ChromeShellActivity;
 import org.chromium.chrome.shell.ChromeShellTestBase;
 import org.chromium.content.browser.NavigationClient;
-import org.chromium.content.browser.NavigationEntry;
-import org.chromium.content.browser.NavigationHistory;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
+import org.chromium.content_public.browser.NavigationEntry;
+import org.chromium.content_public.browser.NavigationHistory;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 
 /**
  * Tests for the navigation popup.
  */
 public class NavigationPopupTest extends ChromeShellTestBase {
 
     private static final int INVALID_NAVIGATION_INDEX = -1;
 
     private ChromeShellActivity mActivity;
 
     @Override
     public void setUp() throws Exception {
         super.setUp();
 
         mActivity = launchChromeShellWithBlankPage();
     }
 
     // Exists solely to expose protected methods to this test.
     private static class TestNavigationHistory extends NavigationHistory {
         @Override
-        protected void addEntry(NavigationEntry entry) {
+        public void addEntry(NavigationEntry entry) {
             super.addEntry(entry);
         }
     }
 
     // Exists solely to expose protected methods to this test.
     private static class TestNavigationEntry extends NavigationEntry {
         public TestNavigationEntry(int index, String url, String virtualUrl, String originalUrl,
                 String title, Bitmap favicon) {
             super(index, url, virtualUrl, originalUrl, title, favicon);
         }
@@ skipping 86 matching lines @@
             public void run() {
                 popup.performItemClick(1);
             }
         });
 
         assertFalse("Popup did not hide as expected.", popup.isShowing());
         assertEquals("Popup attempted to navigate to the wrong index", 5, client.mNavigatedIndex);
     }
 
 }