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

chrome/browser/sync/protocol/proto_value_conversions.cc

 // Copyright (c) 2011 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 "chrome/browser/sync/protocol/proto_value_conversions.h"
 
 #include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.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"
 #include "chrome/browser/sync/protocol/encryption.pb.h"
 #include "chrome/browser/sync/protocol/extension_setting_specifics.pb.h"
 #include "chrome/browser/sync/protocol/extension_specifics.pb.h"
 #include "chrome/browser/sync/protocol/nigori_specifics.pb.h"
 #include "chrome/browser/sync/protocol/password_specifics.pb.h"
 #include "chrome/browser/sync/protocol/preference_specifics.pb.h"
 #include "chrome/browser/sync/protocol/proto_enum_conversions.h"
@@ skipping 146 matching lines @@
   SET_STR(guid);
   SET_STR(app_id);
   SET_INT64(creation_timestamp_ms);
   SET_STR(title);
   SET_STR(body_text);
   SET_STR(link_url);
   SET_STR(link_text);
   return value;
 }
 
+DictionaryValue* AppSettingSpecificsToValue(
+    const sync_pb::AppSettingSpecifics& proto) {
+  DictionaryValue* value = new DictionaryValue();
+  SET(extension_setting, ExtensionSettingSpecificsToValue);
+  return value;
+}
+
 DictionaryValue* AppSpecificsToValue(
     const sync_pb::AppSpecifics& proto) {
   DictionaryValue* value = new DictionaryValue();
   SET(extension, ExtensionSpecificsToValue);
   return value;
 }
 
 DictionaryValue* AutofillSpecificsToValue(
     const sync_pb::AutofillSpecifics& proto) {
   DictionaryValue* value = new DictionaryValue();
@@ skipping 62 matching lines @@
     const sync_pb::NigoriSpecifics& proto) {
   DictionaryValue* value = new DictionaryValue();
   SET(encrypted, EncryptedDataToValue);
   SET_BOOL(using_explicit_passphrase);
   SET_BOOL(encrypt_bookmarks);
   SET_BOOL(encrypt_preferences);
   SET_BOOL(encrypt_autofill_profile);
   SET_BOOL(encrypt_autofill);
   SET_BOOL(encrypt_themes);
   SET_BOOL(encrypt_typed_urls);
+  SET_BOOL(encrypt_extension_settings);
   SET_BOOL(encrypt_extensions);
   SET_BOOL(encrypt_sessions);
+  SET_BOOL(encrypt_app_settings);
   SET_BOOL(encrypt_apps);
   SET_BOOL(encrypt_search_engines);
   SET_BOOL(sync_tabs);
   SET_BOOL(encrypt_everything);
-  SET_BOOL(encrypt_extension_settings);
   return value;
 }
 
 DictionaryValue* PasswordSpecificsToValue(
     const sync_pb::PasswordSpecifics& proto) {
   DictionaryValue* value = new DictionaryValue();
   SET(encrypted, EncryptedDataToValue);
   return value;
 }
 
@@ skipping 53 matching lines @@
   SET_STR(title);
   SET_BOOL(hidden);
   SET_INT64_REP(visits);
   SET_INT32_REP(visit_transitions);
   return value;
 }
 
 DictionaryValue* EntitySpecificsToValue(
     const sync_pb::EntitySpecifics& specifics) {
   DictionaryValue* value = new DictionaryValue();
+  SET_EXTENSION(sync_pb, app, AppSpecificsToValue);
   SET_EXTENSION(sync_pb, app_notification, AppNotificationSpecificsToValue);
-  SET_EXTENSION(sync_pb, app, AppSpecificsToValue);
+  SET_EXTENSION(sync_pb, app_setting, AppSettingSpecificsToValue);
   SET_EXTENSION(sync_pb, autofill, AutofillSpecificsToValue);
   SET_EXTENSION(sync_pb, autofill_profile, AutofillProfileSpecificsToValue);
   SET_EXTENSION(sync_pb, bookmark, BookmarkSpecificsToValue);
   SET_EXTENSION(sync_pb, extension, ExtensionSpecificsToValue);
   SET_EXTENSION(sync_pb, extension_setting, ExtensionSettingSpecificsToValue);
   SET_EXTENSION(sync_pb, nigori, NigoriSpecificsToValue);
   SET_EXTENSION(sync_pb, password, PasswordSpecificsToValue);
   SET_EXTENSION(sync_pb, preference, PreferenceSpecificsToValue);
   SET_EXTENSION(sync_pb, search_engine, SearchEngineSpecificsToValue);
   SET_EXTENSION(sync_pb, session, SessionSpecificsToValue);
   SET_EXTENSION(sync_pb, theme, ThemeSpecificsToValue);
   SET_EXTENSION(sync_pb, typed_url, TypedUrlSpecificsToValue);
   return value;
 }
 
 #undef SET
 #undef SET_REP
 
 #undef SET_BOOL
 #undef SET_BYTES
 #undef SET_INT32
 #undef SET_INT64
 #undef SET_INT64_REP
 #undef SET_STR
 
 #undef SET_EXTENSION
 
 }  // namespace browser_sync