Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java

Issue 11567061: Throw exception when initialization failed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
index 408c2d3f658f3cafc0f158d265f74d3b6a659be2..c986ed5ec7a6d208ad4b9940f7eeb99a85bf5aa5 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
@@ -22,6 +22,7 @@ import org.chromium.content.browser.test.util.CallbackHelper;
import org.chromium.content.browser.test.util.Criteria;
import org.chromium.content.browser.test.util.CriteriaHelper;
import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
+import org.chromium.content.common.ProcessInitException;
import org.chromium.ui.gfx.ActivityNativeWindow;
import java.util.concurrent.atomic.AtomicInteger;
@@ -53,8 +54,12 @@ public class AndroidWebViewTestBase
@Override
public void run() {
AwTestResourceProvider.registerResources(context);
- ContentViewCore.initChromiumBrowserProcess(
- context, ContentView.MAX_RENDERERS_SINGLE_PROCESS);
+ try {
+ ContentViewCore.initChromiumBrowserProcess(
+ context, ContentView.MAX_RENDERERS_SINGLE_PROCESS);
+ } catch (ProcessInitException e) {
+ throw new Error("Failed to initialize browser process", e);
+ }
}
});
}
@@ -204,14 +209,14 @@ public class AndroidWebViewTestBase
}
protected AwTestContainerView createAwTestContainerView(final boolean incognito,
- final AwContentsClient awContentsClient) {
+ final AwContentsClient awContentsClient) throws ProcessInitException {
return createAwTestContainerView(incognito, new AwTestContainerView(getActivity()),
awContentsClient);
}
protected AwTestContainerView createAwTestContainerView(final boolean incognito,
final AwTestContainerView testContainerView,
- final AwContentsClient awContentsClient) {
+ final AwContentsClient awContentsClient) throws ProcessInitException {
testContainerView.initialize(new AwContents(testContainerView,
testContainerView.getInternalAccessDelegate(),
awContentsClient, new ActivityNativeWindow(getActivity()),
@@ -235,7 +240,11 @@ public class AndroidWebViewTestBase
getInstrumentation().runOnMainSync(new Runnable() {
@Override
public void run() {
- testContainerView.set(createAwTestContainerView(incognito, client));
+ try {
+ testContainerView.set(createAwTestContainerView(incognito, client));
+ } catch (Exception e) {
+ throw new Error(e);
+ }
}
});
return testContainerView.get();

Powered by Google App Engine
This is Rietveld 408576698