Let the Nigori client import and export raw encryption keys.

chrome/browser/sync/util/cryptographer.cc

Index: chrome/browser/sync/util/cryptographer.cc
diff --git a/chrome/browser/sync/util/cryptographer.cc b/chrome/browser/sync/util/cryptographer.cc
index f323d17eb82d88ef8689c24c7b6a26a6d300fad3..7a5e1730d9a64d53f0ec434ea804d5938955da9a 100644
--- a/chrome/browser/sync/util/cryptographer.cc
+++ b/chrome/browser/sync/util/cryptographer.cc
@@ -83,8 +83,10 @@ bool Cryptographer::AddKey(const KeyParams& params) {
   DCHECK(NULL == pending_keys_.get());
 
   // Create the new Nigori and make it the default encryptor.
-  scoped_ptr<Nigori> nigori(new Nigori(params.hostname));
-  if (!nigori->Init(params.username, params.password)) {
+  scoped_ptr<Nigori> nigori(new Nigori);
+  if (!nigori->InitByDerivation(params.hostname,
+                                params.username,
+                                params.password)) {
     NOTREACHED();  // Invalid username or password.
     return false;
   }
@@ -115,8 +117,10 @@ void Cryptographer::SetPendingKeys(const sync_pb::EncryptedData& encrypted) {
 }
 
 bool Cryptographer::DecryptPendingKeys(const KeyParams& params) {
-  Nigori nigori(params.hostname);
-  if (!nigori.Init(params.username, params.password)) {
+  Nigori nigori;
+  if (!nigori.InitByDerivation(params.hostname,
+                               params.username,
+                               params.password)) {
     NOTREACHED();
     return false;
   }
@@ -142,8 +146,10 @@ void Cryptographer::InstallKeys(const std::string& default_key_name,
     const sync_pb::NigoriKey key = bag.key(i);
     // Only use this key if we don't already know about it.
     if (nigoris_.end() == nigoris_.find(key.name())) {
-      scoped_ptr<Nigori> new_nigori(new Nigori(key.hostname()));
-      if (!new_nigori->Init(key.username(), key.password())) {
+      scoped_ptr<Nigori> new_nigori(new Nigori);
+      if (!new_nigori->InitByDerivation(key.hostname(),
+                                        key.username(),
+                                        key.password())) {
         NOTREACHED();
         continue;
       }