Changed OAuth token+secret encryption to use supplemental user key.

crypto/symmetric_key.h

Index: crypto/symmetric_key.h
===================================================================
--- crypto/symmetric_key.h	(revision 99168)
+++ crypto/symmetric_key.h	(working copy)
@@ -32,6 +32,10 @@
     HMAC_SHA1,
   };
 
+#if defined(OS_CHROMEOS)
+  explicit SymmetricKey(PK11SymKey* key);

[wtc, 2011/09/06 21:35:17]

Maybe it's better to add an ImportPlatformKey or ImportNSSKey
static method, rather than making this constructor public.

Please document that this constructor (or static method)
takes ownership of |key|.

[zel, 2011/09/06 22:33:35]

Added comment.

I thought about that ImportNSSKey approach but I still don't have a good public
SymmetricKey constructor on ChromeOS. I've create a factory function
SymmetricKey::CreateFromKey() instead.

+#endif
+
   virtual ~SymmetricKey();
 
   // Generates a random key suitable to be used with |algorithm| and of
@@ -76,7 +80,9 @@
   SymmetricKey() {}
   std::string key_;
 #elif defined(USE_NSS)
+#if !defined(OS_CHROMEOS)
   explicit SymmetricKey(PK11SymKey* key);
+#endif
   ScopedPK11SymKey key_;
 #elif defined(OS_MACOSX)
   SymmetricKey(const void* key_data, size_t key_size_in_bits);