Enable sync for the settings from the Extension Settings API.

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 273 matching lines @@
   if (nigori.encrypt_preferences())
     encrypted_types_.insert(syncable::PREFERENCES);
   if (nigori.encrypt_autofill_profile())
     encrypted_types_.insert(syncable::AUTOFILL_PROFILE);
   if (nigori.encrypt_autofill())
     encrypted_types_.insert(syncable::AUTOFILL);
   if (nigori.encrypt_themes())
     encrypted_types_.insert(syncable::THEMES);
   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_apps())
     encrypted_types_.insert(syncable::APPS);
 
   // Note: the initial version with encryption did not support the
@@ skipping 13 matching lines @@
   nigori->set_encrypt_bookmarks(
       encrypted_types_.count(syncable::BOOKMARKS) > 0);
   nigori->set_encrypt_preferences(
       encrypted_types_.count(syncable::PREFERENCES) > 0);
   nigori->set_encrypt_autofill_profile(
       encrypted_types_.count(syncable::AUTOFILL_PROFILE) > 0);
   nigori->set_encrypt_autofill(encrypted_types_.count(syncable::AUTOFILL) > 0);
   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_apps(encrypted_types_.count(syncable::APPS) > 0);
 }
 
 void Cryptographer::set_encrypt_everything() {
   encrypt_everything_ = true;
@@ skipping 27 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