Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / cronet / android / test / javatests / src / org / chromium / cronet_test_apk / CronetTestBase.java

diff --git a/src/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetTestBase.java b/src/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetTestBase.java
index 9b0e283..eac0754 100644 (file)
--- a/src/components/cronet/android/test/javatests/src/org/chromium/cronet_test_apk/CronetTestBase.java
+++ b/src/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();
     }