| Index: net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
|
| diff --git a/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java b/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
|
| index 58dd26a5f4f5b577ed367d2f0b00f2d3eed5bb95..ab832c98a9f4567082270bf3d716b58a5a2cea61 100644
|
| --- a/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
|
| +++ b/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2013 The Chromium Authors. All rights reserved.
|
| +// 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.
|
|
|
| @@ -28,8 +28,7 @@ public class AndroidKeyStoreTestUtil {
|
| * @return new PrivateKey handle, or null in case of error.
|
| */
|
| @CalledByNative
|
| - public static PrivateKey createPrivateKeyFromPKCS8(int type,
|
| - byte[] encoded_key) {
|
| + public static PrivateKey createPrivateKeyFromPKCS8(int type, byte[] encodedKey) {
|
| String algorithm = null;
|
| switch (type) {
|
| case PrivateKeyType.RSA:
|
| @@ -47,7 +46,7 @@ public class AndroidKeyStoreTestUtil {
|
|
|
| try {
|
| KeyFactory factory = KeyFactory.getInstance(algorithm);
|
| - KeySpec ks = new PKCS8EncodedKeySpec(encoded_key);
|
| + KeySpec ks = new PKCS8EncodedKeySpec(encodedKey);
|
| PrivateKey key = factory.generatePrivate(ks);
|
| return key;
|
|
|
|
|