Index: components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetTestBase.java |
diff --git a/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetTestBase.java b/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetTestBase.java |
index 9b0e28381eb282329c7008f3d086ae13d1f050bf..eac0754468de0e7cf98454d0111e85fd51532e7f 100644 |
--- a/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetTestBase.java |
+++ b/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetTestBase.java |
@@ -66,6 +66,13 @@ public class CronetTestBase extends |
commandLineArgs); |
} |
setActivityIntent(intent); |
+ // Make sure the activity was created as expected. |
+ assertNotNull(getActivity()); |
+ try { |
+ waitForActiveShellToBeDoneLoading(); |
+ } catch (Throwable e) { |
+ fail("Test activity has failed to load."); |
+ } |
return getActivity(); |
} |