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

crypto/symmetric_key.h

 // Copyright (c) 2011 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.
 
 #ifndef CRYPTO_SYMMETRIC_KEY_H_
 #define CRYPTO_SYMMETRIC_KEY_H_
 #pragma once
 
 #include <string>
 
@@ skipping 53 matching lines @@
   CSSM_DATA cssm_data() const;
 #elif defined(OS_WIN)
   HCRYPTKEY key() const { return key_.get(); }
 #endif
 
   // 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);
 
+#if defined(OS_CHROMEOS)
+  // Creates symmetric key from NSS key. Takes over the ownership of |key|.
+  static SymmetricKey* CreateFromKey(PK11SymKey* key);
+#endif
+
  private:
 #if defined(USE_OPENSSL)
   SymmetricKey() {}
   std::string key_;
 #elif defined(USE_NSS)
   explicit SymmetricKey(PK11SymKey* key);
   ScopedPK11SymKey key_;
 #elif defined(OS_MACOSX)
   SymmetricKey(const void* key_data, size_t key_size_in_bits);
   std::string key_;
@@ skipping 12 matching lines @@
   // fails with NTE_BAD_KEY/NTE_BAD_LEN
   std::string raw_key_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(SymmetricKey);
 };
 
 }  // namespace crypto
 
 #endif  // CRYPTO_SYMMETRIC_KEY_H_