| 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..f13e348e8637e33ee59aac4b08cbf51417131834 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
|
| @@ -15,6 +15,7 @@ import android.view.View;
|
| import org.chromium.base.BaseSwitches;
|
| import org.chromium.base.CommandLine;
|
| import org.chromium.base.library_loader.LibraryLoader;
|
| +import org.chromium.base.library_loader.LibraryProcessType;
|
| import org.chromium.base.library_loader.Linker;
|
| import org.chromium.base.library_loader.ProcessInitException;
|
| import org.chromium.content.browser.BrowserStartupController;
|
| @@ -85,7 +86,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(LibraryProcessType.PROCESS_BROWSER).ensureInitialized();
|
| } catch (ProcessInitException e) {
|
| Log.i(TAG, "Cannot load chromium_linker_test:" + e);
|
| }
|
| @@ -93,7 +94,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(), LibraryProcessType.PROCESS_BROWSER)
|
| + .initChromiumBrowserProcessForTests();
|
|
|
| LayoutInflater inflater =
|
| (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
| @@ -105,18 +107,19 @@ public class ChromiumLinkerTestActivity extends Activity {
|
| mShellManager.setStartupUrl("about:blank");
|
|
|
| try {
|
| - BrowserStartupController.get(this).startBrowserProcessesAsync(
|
| - new BrowserStartupController.StartupCallback() {
|
| - @Override
|
| - public void onSuccess(boolean alreadyStarted) {
|
| - finishInitialization(savedInstanceState);
|
| - }
|
| -
|
| - @Override
|
| - public void onFailure() {
|
| - initializationFailed();
|
| - }
|
| - });
|
| + BrowserStartupController.get(this, LibraryProcessType.PROCESS_BROWSER)
|
| + .startBrowserProcessesAsync(
|
| + new BrowserStartupController.StartupCallback() {
|
| + @Override
|
| + public void onSuccess(boolean alreadyStarted) {
|
| + finishInitialization(savedInstanceState);
|
| + }
|
| +
|
| + @Override
|
| + public void onFailure() {
|
| + initializationFailed();
|
| + }
|
| + });
|
| } catch (ProcessInitException e) {
|
| Log.e(TAG, "Unable to load native library.", e);
|
| finish();
|
|
|