[Sync] USS: Ignore encryption changes during conflict resolution 2/2

sync/test/engine/mock_model_type_processor.cc

Index: sync/test/engine/mock_model_type_processor.cc
diff --git a/sync/test/engine/mock_model_type_processor.cc b/sync/test/engine/mock_model_type_processor.cc
index c4ecb3d39784cb7243949a994bfb7016b25f42d7..e6d27015993623eb7f04a8e07f94662e38d33a9e 100644
--- a/sync/test/engine/mock_model_type_processor.cc
+++ b/sync/test/engine/mock_model_type_processor.cc
@@ -7,7 +7,9 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "base/base64.h"
 #include "base/bind.h"
+#include "base/sha1.h"
 #include "sync/engine/commit_queue.h"
 
 namespace syncer_v2 {
@@ -90,6 +92,8 @@ CommitRequestData MockModelTypeProcessor::CommitRequest(
   request_data.entity = data.PassToPtr();
   request_data.sequence_number = GetNextSequenceNumber(tag_hash);
   request_data.base_version = base_version;
+  base::Base64Encode(base::SHA1HashString(specifics.SerializeAsString()),

[skym, 2016/04/29 18:43:19]

Is there a reason we Base64 the hash? I realize this is supposed to match the
real proc, but why does the real proc do this?

[maxbogue, 2016/05/03 17:46:15]

I'm not sure exactly how SerializeAsString() works, but I imagine it's a lot
easier to deal with strings (for debugging and such) that only have printable
characters instead of just a raw bytestream.

+                     &request_data.specifics_hash);
 
   return request_data;
 }