Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / android / shell / javatests / src / org / chromium / chrome / shell / ChromeShellUrlTest.java

diff --git a/src/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java b/src/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java
index c133ec7..76a5143 100644 (file)
--- a/src/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java
+++ b/src/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java
@@ -64,9 +64,10 @@ public class ChromeShellUrlTest extends ChromeShellTestBase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                isShowingInterstitialPage.set(contentViewCore.get().isShowingInterstitialPage());
-                url.set(contentViewCore.get().getUrl());
-                title.set(contentViewCore.get().getTitle());
+                isShowingInterstitialPage.set(contentViewCore.get().getWebContents()
+                        .isShowingInterstitialPage());
+                url.set(contentViewCore.get().getWebContents().getUrl());
+                title.set(contentViewCore.get().getWebContents().getTitle());
             }
         });
         assertFalse("Showed interstitial page instead of welcome page",
@@ -99,8 +100,8 @@ public class ChromeShellUrlTest extends ChromeShellTestBase {
                     WindowAndroid windowAndroid = new WindowAndroid(
                             getInstrumentation().getTargetContext().getApplicationContext());
                     ContentViewRenderView contentViewRenderView =
-                            new ContentViewRenderView(getInstrumentation().getTargetContext(),
-                                    windowAndroid);
+                            new ContentViewRenderView(getInstrumentation().getTargetContext());
+                    contentViewRenderView.onNativeLibraryLoaded(windowAndroid);
                     contentViewRenderView.setCurrentContentViewCore(
                             activity.getActiveContentViewCore());
                 }