Restructuring NavigationController functionalities from ContentViewCore to NavigationController

android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java

 // Copyright 2012 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.android_webview.test;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.DisabledTest;
-import org.chromium.content.browser.NavigationEntry;
-import org.chromium.content.browser.NavigationHistory;
 import org.chromium.content.browser.test.util.HistoryUtils;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
+import org.chromium.content_public.browser.NavigationEntry;
+import org.chromium.content_public.browser.NavigationHistory;
 import org.chromium.net.test.util.TestWebServer;
 
 import java.util.concurrent.Callable;
 
 /**
  * Navigation history tests.
  */
 public class NavigationHistoryTest extends AwTestBase {
 
     private static final String PAGE_1_PATH = "/page1.html";
@@ skipping 282 matching lines @@
                 onPageFinishedHelper);
         pollOnUiThread(new Callable<Boolean>() {
             @Override
             public Boolean call() {
                 String title = mAwContents.getContentViewCore().getTitle();
                 return LOGIN_RESPONSE_PAGE_TITLE.equals(title);
             }
         });
     }
 }