Chromium Code Reviews| 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..480b9c6c76267b9dde8a2fcacef2e84bc9132002 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 |
| @@ -14,6 +14,8 @@ import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout; |
| import java.util.concurrent.atomic.AtomicBoolean; |
| + |
|
xunjieli
2014/10/31 21:01:51
nit: extra blank line.
mef
2014/10/31 21:43:15
Done.
|
| + |
| /** |
| * Base test class for all CronetTest based tests. |
| */ |
| @@ -66,6 +68,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(); |
| } |