Take 2: sync changes to support encryption

chrome/browser/sync/util/cryptographer.h

 // Copyright (c) 2010 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 CHROME_BROWSER_SYNC_UTIL_CRYPTOGRAPHER_H_
 #define CHROME_BROWSER_SYNC_UTIL_CRYPTOGRAPHER_H_
 
 #include <map>
 #include <string>
 
 #include "base/linked_ptr.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/sync/protocol/nigori_specifics.pb.h"
 #include "chrome/browser/sync/util/nigori.h"
 
 namespace browser_sync {
 
+extern const char kNigoriTag[];
+
 // The parameters used to initialize a Nigori instance.
 struct KeyParams {
   std::string hostname;
   std::string username;
   std::string password;
 };
 
 // This class manages the Nigori objects used to encrypt and decrypt sensitive
 // sync data (eg. passwords). Each Nigori object knows how to handle data
 // protected with a particular passphrase.
@@ skipping 70 matching lines @@
   NigoriMap::value_type* default_nigori_;  // The Nigori used for encryption.
 
   scoped_ptr<sync_pb::EncryptedData> pending_keys_;
 
   DISALLOW_COPY_AND_ASSIGN(Cryptographer);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_UTIL_CRYPTOGRAPHER_H_