Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git] / src / chrome / android / javatests / src / org / chromium / chrome / browser / NavigationPopupTest.java
index e57d34f..fdbf7b8 100644 (file)
@@ -14,10 +14,10 @@ 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;
@@ -41,7 +41,7 @@ public class NavigationPopupTest extends ChromeShellTestBase {
     // 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);
         }
     }