| Index: chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java
|
| diff --git a/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java
|
| index f7a70c1f7e5c84b958ad65dfb8ba4fb40dc5270a..122479276c6cdfdfabc062898f4d99ca09012634 100644
|
| --- a/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java
|
| +++ b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java
|
| @@ -18,8 +18,8 @@ import org.chromium.base.ThreadUtils;
|
| import org.chromium.base.library_loader.ProcessInitException;
|
| import org.chromium.base.test.BaseActivityInstrumentationTestCase;
|
| import org.chromium.base.test.util.CommandLineFlags;
|
| +import org.chromium.chrome.browser.ChromeBrowserStartupController;
|
| import org.chromium.chrome.test.util.ApplicationData;
|
| -import org.chromium.content.browser.BrowserStartupController;
|
| import org.chromium.content.browser.test.util.Criteria;
|
| import org.chromium.content.browser.test.util.CriteriaHelper;
|
| import org.chromium.content.common.ContentSwitches;
|
| @@ -46,7 +46,8 @@ public class ChromeShellTestBase extends BaseActivityInstrumentationTestCase<Chr
|
| public void run() {
|
| CommandLine.initFromFile("/data/local/tmp/chrome-shell-command-line");
|
| try {
|
| - BrowserStartupController.get(targetContext).startBrowserProcessesSync(false);
|
| + ChromeBrowserStartupController.get(targetContext)
|
| + .startBrowserProcessesSync(false);
|
| } catch (ProcessInitException e) {
|
| Log.e(TAG, "Unable to load native library.", e);
|
| fail("Unable to load native library");
|
|
|