Listen for new system certificates.

net/android/javatests/src/org/chromium/net/X509UtilTest.java

Index: net/android/javatests/src/org/chromium/net/X509UtilTest.java
diff --git a/net/android/javatests/src/org/chromium/net/X509UtilTest.java b/net/android/javatests/src/org/chromium/net/X509UtilTest.java
index 7dcbc685cd4ca20d5a8fdaa4f2b3baa3fbd8481b..42230b666e77052f4b46c4f1c60217ce2f471eb6 100644
--- a/net/android/javatests/src/org/chromium/net/X509UtilTest.java
+++ b/net/android/javatests/src/org/chromium/net/X509UtilTest.java
@@ -71,29 +71,39 @@ public class X509UtilTest extends InstrumentationTestCase {
         return bytes;
     }
 
+    private Context GetContext() {
+        return getInstrumentation().getContext();
+    }
+
     @MediumTest
     public void testEkusVerified() throws GeneralSecurityException, IOException {
-        X509Util.addTestRootCertificate(pemToDer(CERTS_DIRECTORY + BAD_EKU_TEST_ROOT));
-        X509Util.addTestRootCertificate(pemToDer(CERTS_DIRECTORY + GOOD_ROOT_CA));
+        X509Util.addTestRootCertificate(GetContext(),
+                                        pemToDer(CERTS_DIRECTORY + BAD_EKU_TEST_ROOT));
+        X509Util.addTestRootCertificate(GetContext(),
+                                        pemToDer(CERTS_DIRECTORY + GOOD_ROOT_CA));
 
         assertFalse(X509Util.verifyKeyUsage(
             X509Util.createCertificateFromBytes(
+                GetContext(),
                 pemToDer(CERTS_DIRECTORY + CRITICAL_CODE_SIGNING_EE))));
 
         assertFalse(X509Util.verifyKeyUsage(
             X509Util.createCertificateFromBytes(
+                GetContext(),
                 pemToDer(CERTS_DIRECTORY + NON_CRITICAL_CODE_SIGNING_EE))));
 
         assertFalse(X509Util.verifyKeyUsage(
             X509Util.createCertificateFromBytes(
+                GetContext(),
                 readFileBytes(CERTS_DIRECTORY + WEB_CLIENT_AUTH_EE))));
 
         assertTrue(X509Util.verifyKeyUsage(
             X509Util.createCertificateFromBytes(
+                GetContext(),
                 pemToDer(CERTS_DIRECTORY + OK_CERT))));
 
         try {
-            X509Util.clearTestRootCertificates();
+            X509Util.clearTestRootCertificates(GetContext());
         } catch (Exception e) {
             fail("Could not clear test root certificates: " + e.toString());
         }