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

chrome/browser/sync/util/cryptographer.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.
 
 #include "base/base64.h"
 #include "chrome/browser/sync/util/cryptographer.h"
 #include "chrome/browser/password_manager/encryptor.h"
 
 namespace browser_sync {
 
@@ skipping 292 matching lines @@
   if (nigori.encrypt_typed_urls())
     encrypted_types.insert(syncable::TYPED_URLS);
   if (nigori.encrypt_extension_settings())
     encrypted_types.insert(syncable::EXTENSION_SETTINGS);
   if (nigori.encrypt_extensions())
     encrypted_types.insert(syncable::EXTENSIONS);
   if (nigori.encrypt_search_engines())
     encrypted_types.insert(syncable::SEARCH_ENGINES);
   if (nigori.encrypt_sessions())
     encrypted_types.insert(syncable::SESSIONS);
+  if (nigori.encrypt_app_settings())
+    encrypted_types.insert(syncable::APP_SETTINGS);
   if (nigori.encrypt_apps())
     encrypted_types.insert(syncable::APPS);
   if (nigori.encrypt_app_notifications())
     encrypted_types.insert(syncable::APP_NOTIFICATIONS);
 
   // Note: the initial version with encryption did not support the
   // encrypt_everything field. If anything more than the sensitive types were
   // encrypted, it meant we were encrypting everything.
   if (!nigori.has_encrypt_everything() &&
       encrypted_types.size() > SensitiveTypes().size()) {
@@ skipping 17 matching lines @@
   nigori->set_encrypt_themes(encrypted_types_.count(syncable::THEMES) > 0);
   nigori->set_encrypt_typed_urls(
       encrypted_types_.count(syncable::TYPED_URLS) > 0);
   nigori->set_encrypt_extension_settings(
       encrypted_types_.count(syncable::EXTENSION_SETTINGS) > 0);
   nigori->set_encrypt_extensions(
       encrypted_types_.count(syncable::EXTENSIONS) > 0);
   nigori->set_encrypt_search_engines(
       encrypted_types_.count(syncable::SEARCH_ENGINES) > 0);
   nigori->set_encrypt_sessions(encrypted_types_.count(syncable::SESSIONS) > 0);
+  nigori->set_encrypt_app_settings(
+      encrypted_types_.count(syncable::APP_SETTINGS) > 0);
   nigori->set_encrypt_apps(encrypted_types_.count(syncable::APPS) > 0);
   nigori->set_encrypt_app_notifications(
       encrypted_types_.count(syncable::APP_NOTIFICATIONS) > 0);
 }
 
 void Cryptographer::set_encrypt_everything() {
   if (encrypt_everything_) {
     DCHECK(encrypted_types_ == syncable::GetAllRealModelTypes());
     return;
   }
@@ skipping 47 matching lines @@
         continue;
       }
       nigoris_[key.name()] = make_linked_ptr(new_nigori.release());
     }
   }
   DCHECK(nigoris_.end() != nigoris_.find(default_key_name));
   default_nigori_ = &*nigoris_.find(default_key_name);
 }
 
 }  // namespace browser_sync