Use base64 SHA1 hash for sync IDs

chrome/browser/sync/engine/syncapi_unittest.cc

 // Copyright (c) 2010 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.
 
 // Unit tests for the SyncApi. Note that a lot of the underlying
 // functionality is provided by the Syncable layer, which has its own
 // unit tests. We'll test SyncApi specific things in this harness.
 
 #include "base/scoped_ptr.h"
 #include "base/scoped_temp_dir.h"
-#include "base/string_util.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/test/sync/engine/test_directory_setter_upper.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sync_api {
 
 class SyncApiTest : public testing::Test {
@@ skipping 50 matching lines @@
     EXPECT_TRUE(node.InitByClientTagLookup(syncable::BOOKMARKS,
         "testtag"));
 
     ReadNode root_node(&trans);
     root_node.InitByRootLookup();
     EXPECT_NE(node.GetId(), 0);
     EXPECT_EQ(node.GetId(), root_node.GetFirstChildId());
   }
 }
 
-namespace {
-std::string HashToHex(const std::string& hash) {
-  return HexEncode(hash.data(), hash.length());
-}
-}  // namespace
+TEST_F(SyncApiTest, GenerateSyncableHash) {
+  EXPECT_EQ("OyaXV5mEzrPS4wbogmtKvRfekAI=",
+      BaseNode::GenerateSyncableHash(syncable::BOOKMARKS, "tag1"));
+  EXPECT_EQ("iNFQtRFQb+IZcn1kKUJEZDDkLs4=",
+      BaseNode::GenerateSyncableHash(syncable::PREFERENCES, "tag1"));
+  EXPECT_EQ("gO1cPZQXaM73sHOvSA+tKCKFs58=",
+      BaseNode::GenerateSyncableHash(syncable::AUTOFILL, "tag1"));
 
-// TODO(chron): Finalize the hash format. Renable test. http://crbug.com/36827
-TEST_F(SyncApiTest, DISABLED_GenerateSyncableHash) {
-/*
-  EXPECT_EQ("3B2697579984CEB3D2E306E8826B4ABD17DE9002",
-      HashToHex(BaseNode::GenerateSyncableHash(syncable::BOOKMARKS, "tag1")));
-  EXPECT_EQ("88D150B511506FE219727D642942446430E42ECE",
-      HashToHex(
-          BaseNode::GenerateSyncableHash(syncable::PREFERENCES, "tag1")));
-  EXPECT_EQ("80ED5C3D941768CEF7B073AF480FAD282285B39F",
-      HashToHex(BaseNode::GenerateSyncableHash(syncable::AUTOFILL, "tag1")));
-  EXPECT_EQ("0347982075CCD7F8D5C0A0C3A75D94A76D0890A6",
-      HashToHex(BaseNode::GenerateSyncableHash(syncable::BOOKMARKS, "tag2")));
-  EXPECT_EQ("5D8C6417B6E14B8788B52B45822388014DB7B302",
-      HashToHex(
-          BaseNode::GenerateSyncableHash(syncable::PREFERENCES, "tag2")));
-  EXPECT_EQ("185896CE8E4D1A18CB94DF8EC827E1CB6F032534",
-      HashToHex(BaseNode::GenerateSyncableHash(syncable::AUTOFILL, "tag2")));
-*/
+  EXPECT_EQ("A0eYIHXM1/jVwKDDp12Up20IkKY=",
+      BaseNode::GenerateSyncableHash(syncable::BOOKMARKS, "tag2"));
+  EXPECT_EQ("XYxkF7bhS4eItStFgiOIAU23swI=",
+      BaseNode::GenerateSyncableHash(syncable::PREFERENCES, "tag2"));
+  EXPECT_EQ("GFiWzo5NGhjLlN+OyCfhy28DJTQ=",
+      BaseNode::GenerateSyncableHash(syncable::AUTOFILL, "tag2"));
 }
 
 TEST_F(SyncApiTest, ModelTypesSiloed) {
   {
     WriteTransaction trans(&share_);
     ReadNode root_node(&trans);
     root_node.InitByRootLookup();
     EXPECT_EQ(root_node.GetFirstChildId(), 0);
 
     WriteNode bookmarknode(&trans);
@@ skipping 120 matching lines @@
     ReadTransaction trans(&share_);
     ReadNode node(&trans);
     EXPECT_TRUE(node.InitByClientTagLookup(syncable::BOOKMARKS,
         "testtag"));
     EXPECT_EQ(node.GetTitle(), test_title);
     EXPECT_EQ(node.GetModelType(), syncable::BOOKMARKS);
   }
 }
 
 }  // namespace browser_sync