Revert "Revert 182527" ([Sync] Make SESSIONS an implicit type)

sync/protocol/proto_value_conversions_unittest.cc

 // Copyright (c) 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.
 
 // Keep this file in sync with the .proto files in this directory.
 
 #include "sync/protocol/proto_value_conversions.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
@@ skipping 34 matching lines @@
     const T& specifics(T::default_instance());
     scoped_ptr<DictionaryValue> value(specifics_to_value(specifics));
     // We can't do much but make sure that this doesn't crash.
   }
 };
 
 TEST_F(ProtoValueConversionsTest, ProtoChangeCheck) {
   // If this number changes, that means we added or removed a data
   // type.  Don't forget to add a unit test for {New
   // type}SpecificsToValue below.
-  EXPECT_EQ(25, MODEL_TYPE_COUNT);
+  EXPECT_EQ(26, MODEL_TYPE_COUNT);
 
   // We'd also like to check if we changed any field in our messages.
   // However, that's hard to do: sizeof could work, but it's
   // platform-dependent.  default_instance().ByteSize() won't change
   // for most changes, since most of our fields are optional.  So we
   // just settle for comments in the proto files.
 }
 
 TEST_F(ProtoValueConversionsTest, EncryptedDataToValue) {
   TestSpecificsToValue(EncryptedDataToValue);
@@ skipping 171 matching lines @@
   SET_FIELD(priority_preference);
   SET_FIELD(search_engine);
   SET_FIELD(session);
   SET_FIELD(synced_notification);
   SET_FIELD(theme);
   SET_FIELD(typed_url);
 
 #undef SET_FIELD
 
   scoped_ptr<DictionaryValue> value(EntitySpecificsToValue(specifics));
-  EXPECT_EQ(MODEL_TYPE_COUNT - FIRST_REAL_MODEL_TYPE,
+  EXPECT_EQ(MODEL_TYPE_COUNT - FIRST_REAL_MODEL_TYPE -
+            (LAST_PROXY_TYPE - FIRST_PROXY_TYPE + 1),
             static_cast<int>(value->size()));
 }
 
 namespace {
 // Returns whether the given value has specifics under the entries in the given
 // path.
 bool ValueHasSpecifics(const DictionaryValue& value,
                        const std::string& path) {
   const ListValue* entities_list = NULL;
   const DictionaryValue* entry_dictionary = NULL;
@@ skipping 47 matching lines @@
 
   scoped_ptr<DictionaryValue> value_without_specifics(
       ClientToServerResponseToValue(message, false /* include_specifics */));
   EXPECT_FALSE(value_without_specifics->empty());
   EXPECT_FALSE(ValueHasSpecifics(*(value_without_specifics.get()),
                                  "get_updates.entries"));
 }
 
 }  // namespace
 }  // namespace syncer