| Index: android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java
|
| diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java
|
| index c157249f0901f033962e4fc38c7d4de6dc77d13f..366cfcc9746b440d66c20412b1e9234184519272 100644
|
| --- a/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java
|
| +++ b/android_webview/javatests/src/org/chromium/android_webview/test/GetTitleTest.java
|
| @@ -7,10 +7,10 @@ package org.chromium.android_webview.test;
|
| import android.test.suitebuilder.annotation.SmallTest;
|
| import android.test.suitebuilder.annotation.Smoke;
|
|
|
| +import org.chromium.android_webview.AwContents;
|
| import org.chromium.android_webview.test.util.TestWebServer;
|
| import org.chromium.base.test.util.Feature;
|
| import org.chromium.base.test.util.DisabledTest;
|
| -import org.chromium.content.browser.ContentViewCore;
|
|
|
| /**
|
| * A test suite for ContentView.getTitle().
|
| @@ -23,7 +23,7 @@ public class GetTitleTest extends AndroidWebViewTestBase {
|
| private static final String GET_TITLE_TEST_NO_TITLE_PATH = "/get_title_test_no_title.html";
|
|
|
| private TestAwContentsClient mContentsClient;
|
| - private ContentViewCore mContentViewCore;
|
| + private AwContents mAwContents;
|
|
|
| private static class PageInfo {
|
| public final String mTitle;
|
| @@ -39,8 +39,9 @@ public class GetTitleTest extends AndroidWebViewTestBase {
|
| public void setUp() throws Exception {
|
| super.setUp();
|
| mContentsClient = new TestAwContentsClient();
|
| - mContentViewCore =
|
| - createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();
|
| + final AwTestContainerView testContainerView =
|
| + createAwTestContainerViewOnMainSync(mContentsClient);
|
| + mAwContents = testContainerView.getAwContents();
|
| }
|
|
|
| private static final String getHtml(String title) {
|
| @@ -54,9 +55,9 @@ public class GetTitleTest extends AndroidWebViewTestBase {
|
| }
|
|
|
| private String loadFromDataAndGetTitle(String html) throws Throwable {
|
| - loadDataSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(),
|
| + loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
|
| html, "text/html", false);
|
| - return getTitleOnUiThread(mContentViewCore);
|
| + return getTitleOnUiThread(mAwContents);
|
| }
|
|
|
| private PageInfo loadFromUrlAndGetTitle(String html, String filename) throws Throwable {
|
| @@ -65,8 +66,8 @@ public class GetTitleTest extends AndroidWebViewTestBase {
|
| webServer = new TestWebServer(false);
|
|
|
| final String url = webServer.setResponse(filename, html, null);
|
| - loadUrlSync(mContentViewCore, mContentsClient.getOnPageFinishedHelper(), url);
|
| - return new PageInfo(getTitleOnUiThread(mContentViewCore),
|
| + loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
|
| + return new PageInfo(getTitleOnUiThread(mAwContents),
|
| url.replaceAll("http:\\/\\/", ""));
|
|
|
| } finally {
|
|
|