Upstream version 9.38.198.0

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

diff --git a/src/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java b/src/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java
index 44f02a3..01d160c 100644 (file)
--- a/src/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java
+++ b/src/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java
@@ -4,6 +4,8 @@
 
 package org.chromium.chrome.shell;
 
+import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -12,8 +14,6 @@ import android.test.ActivityInstrumentationTestCase2;
 import android.text.TextUtils;
 import android.util.Log;
 
-import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
-
 import org.chromium.base.CommandLine;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.library_loader.ProcessInitException;
@@ -42,8 +42,7 @@ public class ChromeShellTestBase extends ActivityInstrumentationTestCase2<Chrome
             public void run() {
                 CommandLine.initFromFile("/data/local/tmp/chrome-shell-command-line");
                 try {
-                    BrowserStartupController.get(targetContext).startBrowserProcessesSync(
-                            BrowserStartupController.MAX_RENDERERS_LIMIT);
+                    BrowserStartupController.get(targetContext).startBrowserProcessesSync(false);
                 } catch (ProcessInitException e) {
                     Log.e(TAG, "Unable to load native library.", e);
                     fail("Unable to load native library");
@@ -96,7 +95,7 @@ public class ChromeShellTestBase extends ActivityInstrumentationTestCase2<Chrome
                             ChromeShellTab tab = activity.getActiveTab();
                             if (tab != null) {
                                 isLoaded.set(!tab.isLoading()
-                                        && !TextUtils.isEmpty(tab.getContentView().getUrl()));
+                                        && !TextUtils.isEmpty(tab.getContentViewCore().getUrl()));
                             } else {
                                 isLoaded.set(false);
                             }