Take 2: sync changes to support encryption

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 0fbaa3afae37aa6f1e0b70e86b620bfd1fc26497..f323d17eb82d88ef8689c24c7b6a26a6d300fad3 100644
--- a/chrome/browser/sync/util/cryptographer.cc
+++ b/chrome/browser/sync/util/cryptographer.cc
@@ -6,7 +6,7 @@
 
 namespace browser_sync {
 
-const char kNigoriTag[] = "nigori";
+const char kNigoriTag[] = "google_chrome_nigori";
 
 // We name a particular Nigori instance (ie. a triplet consisting of a hostname,
 // a username, and a password) by calling Permute on this string. Since the
@@ -14,7 +14,7 @@ const char kNigoriTag[] = "nigori";
 // assign the same name to a particular triplet.
 const char kNigoriKeyName[] = "nigori-key";
 
-Cryptographer::Cryptographer() {
+Cryptographer::Cryptographer() : default_nigori_(NULL) {
 }
 
 bool Cryptographer::CanDecrypt(const sync_pb::EncryptedData& data) const {