Update on feedback, update dbus API, add unit tests. TEST=manual,unit,BVT BUG=3628 323

vault_keyset.h

Index: vault_keyset.h
diff --git a/vault_keyset.h b/vault_keyset.h
index 7509162c10a2b6812a62e1e7071a5f190c969bb7..f14169cfb6ba2f9e84e23f454265ae53bcdade5f 100644
--- a/vault_keyset.h
+++ b/vault_keyset.h
@@ -5,8 +5,10 @@
 #ifndef VAULT_KEYSET_H_
 #define VAULT_KEYSET_H_
 
-#include "cryptohome/entropy_source.h"
-#include "cryptohome/secure_blob.h"
+#include <base/basictypes.h>
+
+#include "entropy_source.h"
+#include "secure_blob.h"
 
 namespace cryptohome {
 
@@ -20,10 +22,9 @@ const char kVaultKeysetSignature[] = "ch";
 class VaultKeyset {
  public:
   VaultKeyset();
-  VaultKeyset(const SecureBlob& source);
 
   bool AssignBuffer(const SecureBlob& buffer);
-  SecureBlob ToBuffer() const;
+  bool ToBuffer(SecureBlob* buffer) const;
 
   void CreateRandom(const EntropySource& entropy_source);
 
@@ -37,6 +38,7 @@ class VaultKeyset {
   static unsigned int SerializedSize();
 
  private:
+
   SecureBlob fek_;
   SecureBlob fek_sig_;
   SecureBlob fek_salt_;
@@ -49,6 +51,6 @@ class VaultKeyset {
   DISALLOW_COPY_AND_ASSIGN(VaultKeyset);
 };
 
-}  // cryptohome
+}  // namespace cryptohome
 
 #endif  // VAULT_KEYSET_H_