diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 20:48:36 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 20:48:36 +0000 |
| commit | d78354a5e74c5208dd9ebe83717b22223c1e1272 (patch) | |
| tree | 4c616bbbfbf1776055d250644e1a47d435b11c8a /sync/internal_api/write_node.cc | |
| parent | 41fed979ae412d2475a2860ea1ec95531bebb5af (diff) | |
| download | chromium_src-d78354a5e74c5208dd9ebe83717b22223c1e1272.zip chromium_src-d78354a5e74c5208dd9ebe83717b22223c1e1272.tar.gz chromium_src-d78354a5e74c5208dd9ebe83717b22223c1e1272.tar.bz2 | |
[Sync] Rename browser_sync to csync in sync/
Update all references from chrome.
Leave possibly-extraneous csync:: qualifications in sync/ for now.
(This will be cleaned up once everything in sync/ is in csync::.)
BUG=128060
TEST=
TBR=jhawkins@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10600002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/write_node.cc')
| -rw-r--r-- | sync/internal_api/write_node.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sync/internal_api/write_node.cc b/sync/internal_api/write_node.cc index e281fcd..24dd9f0 100644 --- a/sync/internal_api/write_node.cc +++ b/sync/internal_api/write_node.cc @@ -21,7 +21,7 @@ #include "sync/syncable/mutable_entry.h" #include "sync/util/cryptographer.h" -using browser_sync::Cryptographer; +using csync::Cryptographer; using std::string; using std::vector; using syncable::kEncryptedString; @@ -205,7 +205,7 @@ void WriteNode::SetEntitySpecifics( if (GetModelType() != syncable::UNSPECIFIED) { DCHECK_EQ(new_specifics_type, GetModelType()); } - browser_sync::Cryptographer* cryptographer = + csync::Cryptographer* cryptographer = GetTransaction()->GetCryptographer(); // Preserve unknown fields. @@ -479,6 +479,10 @@ const BaseTransaction* WriteNode::GetTransaction() const { return transaction_; } +syncable::MutableEntry* WriteNode::GetMutableEntryForTest() { + return entry_; +} + void WriteNode::Remove() { entry_->Put(syncable::IS_DEL, true); MarkForSyncing(); |