sync: Specialize functions that fetch type root

sync/engine/syncer_unittest.cc

 // Copyright 2012 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>
@@ skipping 67 matching lines @@
 using syncable::GetOnlyEntryWithName;
 using syncable::Id;
 using syncable::kEncryptedString;
 using syncable::MutableEntry;
 using syncable::WriteTransaction;
 
 using syncable::CREATE;
 using syncable::GET_BY_HANDLE;
 using syncable::GET_BY_ID;
 using syncable::GET_BY_CLIENT_TAG;
-using syncable::GET_BY_SERVER_TAG;
+using syncable::GET_BY_SERVER_TAG_DEPRECATED;
+using syncable::GET_TYPE_ROOT;
 using syncable::UNITTEST;
 
 using sessions::MockDebugInfoGetter;
 using sessions::StatusController;
 using sessions::SyncSessionContext;
 using sessions::SyncSession;
 
 namespace {
 
 // A helper to hold on to the counters emitted by the sync engine.
@@ skipping 4034 matching lines @@
   int64 hurdle_handle = CreateUnsyncedDirectory("bob", "id_bob");
   {
     syncable::ReadTransaction trans(FROM_HERE, directory());
     Entry hurdle(&trans, GET_BY_HANDLE, hurdle_handle);
     ASSERT_TRUE(hurdle.good());
     ASSERT_TRUE(!hurdle.GetIsDel());
     ASSERT_TRUE(hurdle.GetUniqueServerTag().empty());
     ASSERT_TRUE(hurdle.GetNonUniqueName()== "bob");
 
     // Try to lookup by the tagname.  These should fail.
-    Entry tag_alpha(&trans, GET_BY_SERVER_TAG, "alpha");
+    Entry tag_alpha(&trans, GET_BY_SERVER_TAG_DEPRECATED, "alpha");
     EXPECT_FALSE(tag_alpha.good());
-    Entry tag_bob(&trans, GET_BY_SERVER_TAG, "bob");
+    Entry tag_bob(&trans, GET_BY_SERVER_TAG_DEPRECATED, "bob");
     EXPECT_FALSE(tag_bob.good());
   }
 
   // Now download some tagged items as updates.
   mock_server_->AddUpdateDirectory(
       1, 0, "update1", 1, 10, std::string(), std::string());
   mock_server_->SetLastUpdateServerTag("alpha");
   mock_server_->AddUpdateDirectory(
       2, 0, "update2", 2, 20, std::string(), std::string());
   mock_server_->SetLastUpdateServerTag("bob");
   SyncShareNudge();
 
   {
     syncable::ReadTransaction trans(FROM_HERE, directory());
 
     // The new items should be applied as new entries, and we should be able
     // to look them up by their tag values.
-    Entry tag_alpha(&trans, GET_BY_SERVER_TAG, "alpha");
+    Entry tag_alpha(&trans, GET_BY_SERVER_TAG_DEPRECATED, "alpha");
     ASSERT_TRUE(tag_alpha.good());
     ASSERT_TRUE(!tag_alpha.GetIsDel());
     ASSERT_TRUE(tag_alpha.GetUniqueServerTag()== "alpha");
     ASSERT_TRUE(tag_alpha.GetNonUniqueName()== "update1");
-    Entry tag_bob(&trans, GET_BY_SERVER_TAG, "bob");
+    Entry tag_bob(&trans, GET_BY_SERVER_TAG_DEPRECATED, "bob");
     ASSERT_TRUE(tag_bob.good());
     ASSERT_TRUE(!tag_bob.GetIsDel());
     ASSERT_TRUE(tag_bob.GetUniqueServerTag()== "bob");
     ASSERT_TRUE(tag_bob.GetNonUniqueName()== "update2");
     // The old item should be unchanged.
     Entry hurdle(&trans, GET_BY_HANDLE, hurdle_handle);
     ASSERT_TRUE(hurdle.good());
     ASSERT_TRUE(!hurdle.GetIsDel());
     ASSERT_TRUE(hurdle.GetUniqueServerTag().empty());
     ASSERT_TRUE(hurdle.GetNonUniqueName()== "bob");
@@ skipping 782 matching lines @@
     EXPECT_EQ("xyz", final_monitor_records["xyz"].extension_id);
     EXPECT_EQ(2049U, final_monitor_records["ABC"].bookmark_write_count);
     EXPECT_EQ(4U,    final_monitor_records["xyz"].bookmark_write_count);
   } else {
     EXPECT_TRUE(final_monitor_records.empty())
         << "Should not restore records after successful bookmark commit.";
   }
 }
 
 }  // namespace syncer