[Sync] Fix encrypting of sync titles.

chrome/browser/sync/engine/syncer_unittest.cc

 // Copyright (c) 2011 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.
 //
 // Syncer unit tests. Unfortunately a lot of these tests
 // are outdated and need to be reworked and updated.
 
 #include <algorithm>
 #include <limits>
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/tracked.h"
 #include "build/build_config.h"
 #include "chrome/browser/sync/engine/conflict_resolver.h"
 #include "chrome/browser/sync/engine/get_commit_ids_command.h"
 #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"
 #include "chrome/browser/sync/engine/syncproto.h"
 #include "chrome/browser/sync/protocol/sync.pb.h"
 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
 #include "chrome/browser/sync/sessions/sync_session_context.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/syncable/syncable.h"
@@ skipping 13 matching lines @@
 namespace browser_sync {
 
 using syncable::BaseTransaction;
 using syncable::Blob;
 using syncable::CountEntriesWithName;
 using syncable::Directory;
 using syncable::Entry;
 using syncable::GetFirstEntryWithName;
 using syncable::GetOnlyEntryWithName;
 using syncable::Id;
+using syncable::kEncryptedString;
 using syncable::MutableEntry;
 using syncable::ReadTransaction;
 using syncable::ScopedDirLookup;
 using syncable::WriteTransaction;
 
 using syncable::BASE_VERSION;
 using syncable::CREATE;
 using syncable::CREATE_NEW_UPDATE_ITEM;
 using syncable::GET_BY_HANDLE;
 using syncable::GET_BY_ID;
@@ skipping 489 matching lines @@
   encrypted_bookmark.mutable_encrypted();
   AddDefaultExtensionValue(syncable::BOOKMARKS, &encrypted_bookmark);
   {
     WriteTransaction wtrans(FROM_HERE, UNITTEST, dir);
     MutableEntry entry_x(&wtrans, GET_BY_HANDLE, handle_x);
     MutableEntry entry_b(&wtrans, GET_BY_HANDLE, handle_b);
     MutableEntry entry_c(&wtrans, GET_BY_HANDLE, handle_c);
     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());
   }
 
   syncable::ModelTypeSet encrypted_types;
   encrypted_types.insert(syncable::BOOKMARKS);
   syncable::Directory::UnsyncedMetaHandles unsynced_handles;
   unsynced_handles.push_back(handle_x);
   unsynced_handles.push_back(handle_b);
   unsynced_handles.push_back(handle_c);
   unsynced_handles.push_back(handle_e);
@@ skipping 4658 matching lines @@
   Add(low_id_);
   Add(high_id_);
   SyncShareAsDelegate();
   ExpectLocalOrderIsByServerId();
 }
 
 const SyncerTest::CommitOrderingTest
 SyncerTest::CommitOrderingTest::LAST_COMMIT_ITEM = {-1, TestIdFactory::root()};
 
 }  // namespace browser_sync