Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5556)

Unified Diff: chrome/browser/sync/syncable/nigori_util.h

Issue 7806005: Revert 98770 - Merge 98758 - [Sync] Gracefully handle writing to a node when the cryptographer is... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/src/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/engine/syncer_unittest.cc ('k') | chrome/browser/sync/syncable/nigori_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/syncable/nigori_util.h
===================================================================
--- chrome/browser/sync/syncable/nigori_util.h (revision 98772)
+++ chrome/browser/sync/syncable/nigori_util.h (working copy)
@@ -15,16 +15,11 @@
class Cryptographer;
}
-namespace sync_pb {
-class EntitySpecifics;
-}
-
namespace syncable {
const char kEncryptedString[] = "encrypted";
class BaseTransaction;
-class Entry;
class ReadTransaction;
class WriteTransaction;
@@ -48,16 +43,6 @@
WriteTransaction* const trans,
browser_sync::Cryptographer* cryptographer);
-// Returns true if the entry requires encryption but is not encrypted, false
-// otherwise. Note: this does not check that already encrypted entries are
-// encrypted with the proper key.
-bool EntryNeedsEncryption(const ModelTypeSet& encrypted_types,
- const Entry& entry);
-
-// Same as EntryNeedsEncryption, but looks at specifics.
-bool SpecificsNeedsEncryption(const ModelTypeSet& encrypted_types,
- const sync_pb::EntitySpecifics& specifics);
-
// Verifies all data of type |type| is encrypted appropriately.
bool VerifyDataTypeEncryption(BaseTransaction* const trans,
browser_sync::Cryptographer* cryptographer,
« no previous file with comments | « chrome/browser/sync/engine/syncer_unittest.cc ('k') | chrome/browser/sync/syncable/nigori_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698