FYI: Control Data + Per-Device Metadata

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/values.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/protocol/app_notification_specifics.pb.h"
 #include "sync/protocol/app_setting_specifics.pb.h"
 #include "sync/protocol/app_specifics.pb.h"
 #include "sync/protocol/autofill_specifics.pb.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
 #include "sync/protocol/encryption.pb.h"
 #include "sync/protocol/extension_setting_specifics.pb.h"
 #include "sync/protocol/extension_specifics.pb.h"
 #include "sync/protocol/nigori_specifics.pb.h"
 #include "sync/protocol/password_specifics.pb.h"
+#include "sync/protocol/per_device_specifics.pb.h"
+#include "sync/protocol/per_user_specifics.pb.h"
 #include "sync/protocol/preference_specifics.pb.h"
 #include "sync/protocol/search_engine_specifics.pb.h"
 #include "sync/protocol/session_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/protocol/theme_specifics.pb.h"
 #include "sync/protocol/typed_url_specifics.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 namespace {
 
 class ProtoValueConversionsTest : public testing::Test {
  protected:
   template <class T>
   void TestSpecificsToValue(
       DictionaryValue* (*specifics_to_value)(const T&)) {
     const T& specifics(T::default_instance());
     scoped_ptr<DictionaryValue> value(specifics_to_value(specifics));
-    // We can't do much but make sure that the returned value has
-    // something in it.
-    EXPECT_FALSE(value->empty());
+    // We can't do much but make sure that the returned value is not null.
+    EXPECT_TRUE(value.get());
   }
 };
 
 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(17, MODEL_TYPE_COUNT);
+  EXPECT_EQ(19, 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 68 matching lines @@
 }
 
 TEST_F(ProtoValueConversionsTest, NigoriSpecificsToValue) {
   TestSpecificsToValue(NigoriSpecificsToValue);
 }
 
 TEST_F(ProtoValueConversionsTest, PasswordSpecificsToValue) {
   TestSpecificsToValue(PasswordSpecificsToValue);
 }
 
+TEST_F(ProtoValueConversionsTest, PerDeviceSpecificsToValue) {
+  TestSpecificsToValue(PerDeviceSpecificsToValue);
+}
+
+TEST_F(ProtoValueConversionsTest, PerUserSpecificsToValue) {
+  TestSpecificsToValue(PerUserSpecificsToValue);
+}
+
 TEST_F(ProtoValueConversionsTest, PreferenceSpecificsToValue) {
   TestSpecificsToValue(PreferenceSpecificsToValue);
 }
 
 TEST_F(ProtoValueConversionsTest, SearchEngineSpecificsToValue) {
   TestSpecificsToValue(SearchEngineSpecificsToValue);
 }
 
 TEST_F(ProtoValueConversionsTest, SessionSpecificsToValue) {
   TestSpecificsToValue(SessionSpecificsToValue);
@@ skipping 18 matching lines @@
   SET_FIELD(app);
   SET_FIELD(app_notification);
   SET_FIELD(app_setting);
   SET_FIELD(autofill);
   SET_FIELD(autofill_profile);
   SET_FIELD(bookmark);
   SET_FIELD(extension);
   SET_FIELD(extension_setting);
   SET_FIELD(nigori);
   SET_FIELD(password);
+  SET_FIELD(per_device_metadata);
+  SET_FIELD(per_user_metadata);
   SET_FIELD(preference);
   SET_FIELD(search_engine);
   SET_FIELD(session);
   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,
@@ skipping 57 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