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

Unified Diff: chrome/browser/sync/profile_sync_service_harness.h

Issue 6537027: Revert 75287 - [Sync] Initial support for encrypting any datatype (no UI hook... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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/profile_sync_service.cc ('k') | chrome/browser/sync/profile_sync_service_harness.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service_harness.h
===================================================================
--- chrome/browser/sync/profile_sync_service_harness.h (revision 75295)
+++ chrome/browser/sync/profile_sync_service_harness.h (working copy)
@@ -114,17 +114,6 @@
// Returns a snapshot of the current sync session.
const SyncSessionSnapshot* GetLastSessionSnapshot() const;
- // Encrypt the datatype |type|. This method will block while the sync backend
- // host performs the encryption or a timeout is reached. Returns false if
- // encryption failed, else true.
- // Note: this method does not currently support tracking encryption status
- // while other sync activities are being performed. Sync should be fully
- // synced when this is called.
- bool EnableEncryptionForType(syncable::ModelType type);
-
- // Check if |type| is encrypted.
- bool IsTypeEncrypted(syncable::ModelType type);
-
private:
friend class StateChangeTimeoutEvent;
@@ -150,9 +139,6 @@
// The sync client anticipates incoming updates leading to a new sync cycle.
WAITING_FOR_UPDATES,
- // The sync client anticipates encryption of new datatypes.
- WAITING_FOR_ENCRYPTION,
-
// The sync client cannot reach the server.
SERVER_UNREACHABLE,
@@ -193,10 +179,6 @@
// for a particular datatype.
std::string GetUpdatedTimestamp(syncable::ModelType model_type);
- // When in WAITING_FOR_ENCRYPTION state, we check to see if this type is now
- // encrypted to determine if we're done.
- syncable::ModelType waiting_for_encryption_type_;
-
WaitState wait_state_;
Profile* profile_;
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/sync/profile_sync_service_harness.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698