This adds support for encrypted ONC import

crypto/symmetric_key.h

Index: crypto/symmetric_key.h
diff --git a/crypto/symmetric_key.h b/crypto/symmetric_key.h
index 3c25fab258405c224a35148888dce69fe15a35a9..5074874bbcadf3627432680f470e112055df2cfe 100644
--- a/crypto/symmetric_key.h
+++ b/crypto/symmetric_key.h
@@ -70,7 +70,7 @@ class CRYPTO_EXPORT SymmetricKey {
   // Extracts the raw key from the platform specific data.
   // Warning: |raw_key| holds the raw key as bytes and thus must be handled
   // carefully.
-  bool GetRawKey(std::string* raw_key);
+  bool GetRawKey(std::string* raw_key) const;

[Ryan Sleevi, 2012/01/04 01:33:43]

This isn't a const operation on Windows, at least not according to the API
specs. Getting the raw key can mutate the underlying key IIRC.

On Mac it works because we keep a copy of the raw key around, but normally (eg:
CSSM-only) it would be the same as Windows.

[Greg Spencer (Chromium), 2012/01/05 22:18:03]

Crap.  OK, I'll change the constness of the arguments all the way up.. Grrr.

 
 #if defined(OS_CHROMEOS)
   // Creates symmetric key from NSS key. Takes over the ownership of |key|.