Listen for new system certificates.

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net;
 
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.telephony.TelephonyManager;
@@ skipping 53 matching lines @@
 
     private static byte[] readFileBytes(String pathname) throws IOException {
         RandomAccessFile file = new RandomAccessFile(pathname, "r");
         byte[] bytes = new byte[(int) file.length()];
         int bytesRead = file.read(bytes);
         if (bytesRead != bytes.length)
             return Arrays.copyOfRange(bytes, 0, bytesRead);
         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());
         }
     }
 }