[Cronet] Make sure to only pass the application Context to InitApplicationContext to avoid DCHECK fa

components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java

Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
index 546f345d25961c4cd8da29bb8520d25bda5feba4..19f2ebab92a173f8df44185e4f5ab425c36720fb 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
@@ -4,6 +4,7 @@
 
 package org.chromium.net;
 
+import android.content.ContextWrapper;
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.Looper;
@@ -518,8 +519,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         // Shutdown original context and create another that uses the same cache.
         mActivity.mUrlRequestContext.shutdown();
         mActivity.mUrlRequestContext = mActivity.mUrlRequestContext.createContext(
-                getInstrumentation().getTargetContext().getApplicationContext(),
-                config);
+                getInstrumentation().getTargetContext(), config);
         checkRequestCaching(url, true);
     }
 
@@ -594,4 +594,22 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         assertEquals(200, thread1.mListener.mResponseInfo.getHttpStatusCode());
         assertEquals(404, thread2.mListener.mResponseInfo.getHttpStatusCode());
     }
+
+    @SmallTest
+    @Feature({"Cronet"})
+    public void testInitDifferentContexts() throws Exception {

[xunjieli, 2015/03/06 14:50:31]

Btw, should we test creating multiple ChromiumUrlRequestContext too?

[pauljensen, 2015/03/06 17:01:53]

Done.

+        // Test that concurrently instantiating Cronet context's upon various
+        // different versions of the same Android Context does not cause crashes
+        // like crbug.com/453845
+        mActivity = launchCronetTestApp();
+        CronetUrlRequestContext firstContext =
+                new CronetUrlRequestContext(mActivity, new UrlRequestContextConfig());
+        CronetUrlRequestContext secondContext = new CronetUrlRequestContext(
+                mActivity.getApplicationContext(), new UrlRequestContextConfig());

[mmenke, 2015/03/06 16:52:23]

Shouldn't you just be passing in the mActivity here?

[pauljensen, 2015/03/06 16:57:28]

That's what I do on the previous line.
I'm trying three easy situations concurrently:
1. mActivity
2. mActivity's application context (kind of the parent of mActivity)
3. a wrapper on mActivity (kind of a child of mActivity)

+        CronetUrlRequestContext thirdContext = new CronetUrlRequestContext(
+                new ContextWrapper(mActivity), new UrlRequestContextConfig());
+        firstContext.shutdown();
+        secondContext.shutdown();
+        thirdContext.shutdown();
+    }
 }