[Sync] Add support for proxy types

sync/syncable/directory_backing_store_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.
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 3154 matching lines @@
   ASSERT_TRUE(++it != index.end());
   ASSERT_EQ(14, (*it)->ref(META_HANDLE));
 
   ASSERT_TRUE(++it == index.end());
 }
 
 INSTANTIATE_TEST_CASE_P(DirectoryBackingStore, MigrationTest,
                         testing::Range(67, kCurrentDBVersion));
 
 TEST_F(DirectoryBackingStoreTest, ModelTypeIds) {
-  for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) {
+  ModelTypeSet protocol_types = ProtocolTypes();
+  for (ModelTypeSet::Iterator iter = protocol_types.First(); iter.Good();
+       iter.Inc()) {
     std::string model_id =
-        TestDirectoryBackingStore::ModelTypeEnumToModelId(ModelTypeFromInt(i));
-    EXPECT_EQ(i,
+        TestDirectoryBackingStore::ModelTypeEnumToModelId(iter.Get());
+    EXPECT_EQ(iter.Get(),
         TestDirectoryBackingStore::ModelIdToModelTypeEnum(model_id.data(),
                                                           model_id.size()));
   }
 }
 
 namespace {
 
 class OnDiskDirectoryBackingStoreForTest : public OnDiskDirectoryBackingStore {
  public:
   OnDiskDirectoryBackingStoreForTest(const std::string& dir_name,
@@ skipping 112 matching lines @@
   const std::string& guid2 = TestDirectoryBackingStore::GenerateCacheGUID();
   EXPECT_EQ(24U, guid1.size());
   EXPECT_EQ(24U, guid2.size());
   // In theory this test can fail, but it won't before the universe
   // dies of heat death.
   EXPECT_NE(guid1, guid2);
 }
 
 }  // namespace syncable
 }  // namespace syncer