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

Unified Diff: chrome/browser/sync/engine/syncer_unittest.cc

Issue 7878005: [Sync] Fix encrypting of sync titles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and add comment Created 9 years, 3 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/nigori_util.cc ('k') | chrome/browser/sync/internal_api/syncapi_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/syncer_unittest.cc
diff --git a/chrome/browser/sync/engine/syncer_unittest.cc b/chrome/browser/sync/engine/syncer_unittest.cc
index 093d473736a4938361d82fc0321cbd8004bb84b4..d4242ed967093a66ff95242d5ba1af7c29a46572 100644
--- a/chrome/browser/sync/engine/syncer_unittest.cc
+++ b/chrome/browser/sync/engine/syncer_unittest.cc
@@ -24,6 +24,7 @@
#include "chrome/browser/sync/engine/model_safe_worker.h"
#include "chrome/browser/sync/engine/net/server_connection_manager.h"
#include "chrome/browser/sync/engine/process_updates_command.h"
+#include "chrome/browser/sync/engine/nigori_util.h"
#include "chrome/browser/sync/engine/syncer.h"
#include "chrome/browser/sync/engine/syncer_proto_util.h"
#include "chrome/browser/sync/engine/syncer_util.h"
@@ -57,6 +58,7 @@ using syncable::Entry;
using syncable::GetFirstEntryWithName;
using syncable::GetOnlyEntryWithName;
using syncable::Id;
+using syncable::kEncryptedString;
using syncable::MutableEntry;
using syncable::ReadTransaction;
using syncable::ScopedDirLookup;
@@ -566,9 +568,11 @@ TEST_F(SyncerTest, GetCommitIdsFilterEntriesNeedingEncryption) {
MutableEntry entry_e(&wtrans, GET_BY_HANDLE, handle_e);
MutableEntry entry_f(&wtrans, GET_BY_HANDLE, handle_f);
entry_x.Put(SPECIFICS, encrypted_bookmark);
+ entry_x.Put(NON_UNIQUE_NAME, kEncryptedString);
entry_b.Put(SPECIFICS, DefaultBookmarkSpecifics());
entry_c.Put(SPECIFICS, DefaultBookmarkSpecifics());
entry_e.Put(SPECIFICS, encrypted_bookmark);
+ entry_e.Put(NON_UNIQUE_NAME, kEncryptedString);
entry_f.Put(SPECIFICS, DefaultPreferencesSpecifics());
}
« no previous file with comments | « chrome/browser/sync/engine/nigori_util.cc ('k') | chrome/browser/sync/internal_api/syncapi_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698