Sync: Change Local IDs to GUID based to avoid ID collision

sync/syncable/directory_unittest.cc

 // Copyright 2014 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.
 
 #include "sync/syncable/directory_unittest.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/test/values_test_util.h"
 #include "sync/internal_api/public/base/attachment_id_proto.h"
 #include "sync/syncable/syncable_proto_util.h"
@@ skipping 1607 matching lines @@
     ExpectDictBooleanValue(true, *value, "good");
     EXPECT_TRUE(value->HasKey("kernel"));
     ExpectDictStringValue("Bookmarks", *value, "modelType");
     ExpectDictBooleanValue(true, *value, "existsOnClientBecauseNameIsNonEmpty");
     ExpectDictBooleanValue(false, *value, "isRoot");
   }
 
   dir()->SaveChanges();
 }
 
-// Test that the bookmark tag generation algorithm remains unchanged.
-TEST_F(SyncableDirectoryTest, BookmarkTagTest) {
-  // This test needs its own InMemoryDirectoryBackingStore because it needs to
-  // call request_consistent_cache_guid().
-  InMemoryDirectoryBackingStore* store = new InMemoryDirectoryBackingStore("x");
-
-  // The two inputs that form the bookmark tag are the directory's cache_guid
-  // and its next_id value.  We don't need to take any action to ensure
-  // consistent next_id values, but we do need to explicitly request that our
-  // InMemoryDirectoryBackingStore always return the same cache_guid.
-  store->request_consistent_cache_guid();
-
-  Directory dir(store, unrecoverable_error_handler(), NULL, NULL, NULL);
-  ASSERT_EQ(
-      OPENED,
-      dir.Open("x", directory_change_delegate(), NullTransactionObserver()));
-
-  {
-    WriteTransaction wtrans(FROM_HERE, UNITTEST, &dir);
-    MutableEntry bm(&wtrans, CREATE, BOOKMARKS, wtrans.root_id(), "bm");
-    bm.PutIsUnsynced(true);
-
-    // If this assertion fails, that might indicate that the algorithm used to
-    // generate bookmark tags has been modified.  This could have implications
-    // for bookmark ordering.  Please make sure you know what you're doing if
-    // you intend to make such a change.
-    ASSERT_EQ("6wHRAb3kbnXV5GHrejp4/c1y5tw=", bm.GetUniqueBookmarkTag());
-  }
-}
-
 // A thread that creates a bunch of directory entries.
 class StressTransactionsDelegate : public base::PlatformThread::Delegate {
  public:
   StressTransactionsDelegate(Directory* dir, int thread_number)
       : dir_(dir), thread_number_(thread_number) {}
 
  private:
   Directory* const dir_;
   const int thread_number_;
 
@@ skipping 378 matching lines @@
   dir.OnCatastrophicError();
   dir.OnCatastrophicError();
 
   // See that the unrecoverable error handler has been invoked twice.
   ASSERT_EQ(2, unrecoverable_error_handler.invocation_count());
 }
 
 }  // namespace syncable
 
 }  // namespace syncer