| Index: content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java
|
| diff --git a/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java b/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java
|
| index ba81316686ee4925838e096eb9118cd6b49acc4d..2c6d9c803a1277460d4ac361c3b5425647a49eaf 100644
|
| --- a/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java
|
| +++ b/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java
|
| @@ -85,7 +85,7 @@ public class ChromiumLinkerTestActivity extends Activity {
|
| // Load the library in the browser process, this will also run the test
|
| // runner in this process.
|
| try {
|
| - LibraryLoader.ensureInitialized();
|
| + LibraryLoader.get(LibraryLoader.BROWSER).ensureInitialized();
|
| } catch (ProcessInitException e) {
|
| Log.i(TAG, "Cannot load chromium_linker_test:" + e);
|
| }
|
| @@ -93,7 +93,8 @@ public class ChromiumLinkerTestActivity extends Activity {
|
| // Now, start a new renderer process by creating a new view.
|
| // This will run the test runner in the renderer process.
|
|
|
| - BrowserStartupController.get(getApplicationContext()).initChromiumBrowserProcessForTests();
|
| + BrowserStartupController.get(getApplicationContext(), LibraryLoader.BROWSER)
|
| + .initChromiumBrowserProcessForTests();
|
|
|
| LayoutInflater inflater =
|
| (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
| @@ -105,7 +106,7 @@ public class ChromiumLinkerTestActivity extends Activity {
|
| mShellManager.setStartupUrl("about:blank");
|
|
|
| try {
|
| - BrowserStartupController.get(this).startBrowserProcessesAsync(
|
| + BrowserStartupController.get(this, LibraryLoader.BROWSER).startBrowserProcessesAsync(
|
| new BrowserStartupController.StartupCallback() {
|
| @Override
|
| public void onSuccess(boolean alreadyStarted) {
|
|
|