Separate the syncing of extension settings and app settings into separate data

chrome/browser/sync/protocol/proto_value_conversions_unittest.cc

Index: chrome/browser/sync/protocol/proto_value_conversions_unittest.cc
diff --git a/chrome/browser/sync/protocol/proto_value_conversions_unittest.cc b/chrome/browser/sync/protocol/proto_value_conversions_unittest.cc
index d8ef628818be3cd7f455616ad562868d2858a4f7..63ada75baf1ba14c7b990e30ecc89b2d722dd5e6 100644
--- a/chrome/browser/sync/protocol/proto_value_conversions_unittest.cc
+++ b/chrome/browser/sync/protocol/proto_value_conversions_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/sync/protocol/app_notification_specifics.pb.h"
+#include "chrome/browser/sync/protocol/app_setting_specifics.pb.h"
 #include "chrome/browser/sync/protocol/app_specifics.pb.h"
 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"
 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
@@ -46,7 +47,7 @@ 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(16, syncable::MODEL_TYPE_COUNT);
+  EXPECT_EQ(17, syncable::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
@@ -89,6 +90,10 @@ TEST_F(ProtoValueConversionsTest, AppNotificationSpecificsToValue) {
   TestSpecificsToValue(AppNotificationSpecificsToValue);
 }
 
+TEST_F(ProtoValueConversionsTest, AppSettingSpecificsToValue) {
+  TestSpecificsToValue(AppSettingSpecificsToValue);
+}
+
 TEST_F(ProtoValueConversionsTest, AppSpecificsToValue) {
   TestSpecificsToValue(AppSpecificsToValue);
 }
@@ -151,6 +156,7 @@ TEST_F(ProtoValueConversionsTest, EntitySpecificsToValue) {
 
   SET_EXTENSION(app);
   SET_EXTENSION(app_notification);
+  SET_EXTENSION(app_setting);
   SET_EXTENSION(autofill);
   SET_EXTENSION(autofill_profile);
   SET_EXTENSION(bookmark);