Enable sync for the settings from the Extension Settings API.

chrome/browser/extensions/extension_service.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 "chrome/browser/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 561 matching lines @@
     return false;
   }
 
   return true;
 }
 
 ExtensionService::ExtensionService(Profile* profile,
                                    const CommandLine* command_line,
                                    const FilePath& install_directory,
                                    ExtensionPrefs* extension_prefs,
-                                   ExtensionSettings* extension_settings,
                                    bool autoupdate_enabled,
                                    bool extensions_enabled)
     : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       method_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       profile_(profile),
       extension_prefs_(extension_prefs),
-      extension_settings_(extension_settings),
       pending_extension_manager_(*ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       install_directory_(install_directory),
       extensions_enabled_(extensions_enabled),
       show_extensions_prompts_(true),
       ready_(false),
       toolbar_model_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       permissions_manager_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       apps_promo_(profile->GetPrefs()),
       event_routers_initialized_(false) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 27 matching lines @@
                                         extension_prefs,
                                         profile->GetPrefs(),
                                         profile,
                                         update_frequency));
   }
 
   backend_ =
       new ExtensionServiceBackend(weak_ptr_factory_.GetWeakPtr(),
                                   install_directory_);
 
+  // Construct the settings on the UI thread, but all further interaction
+  // (including destruction) must be done on the FILE thread.
+  extension_settings_ =
+      new ExtensionSettings(
+          profile_->GetPath().AppendASCII(kSettingsDirectoryName));
+
   if (extensions_enabled_) {
     ExternalExtensionProviderImpl::CreateExternalProviders(
         this, profile_, &external_extension_providers_);
   }
 
   // Use monochrome icons for Omnibox icons.
   omnibox_popup_icon_manager_.set_monochrome(true);
   omnibox_icon_manager_.set_monochrome(true);
   omnibox_icon_manager_.set_padding(gfx::Insets(0, kOmniboxIconPaddingLeft,
                                                 0, kOmniboxIconPaddingRight));
@@ skipping 34 matching lines @@
 ExtensionService::~ExtensionService() {
   // No need to unload extensions here because they are profile-scoped, and the
   // profile is in the process of being deleted.
 
   ProviderCollection::const_iterator i;
   for (i = external_extension_providers_.begin();
        i != external_extension_providers_.end(); ++i) {
     ExternalExtensionProviderInterface* provider = i->get();
     provider->ServiceShutdown();
   }
+
+  BrowserThread::DeleteSoon(
+      BrowserThread::FILE, FROM_HERE, extension_settings_);
 }
 
 void ExtensionService::InitEventRoutersAfterImport() {
   registrar_.Add(this, chrome::NOTIFICATION_IMPORT_FINISHED,
                  Source<Profile>(profile_));
 }
 
 void ExtensionService::InitEventRouters() {
   if (event_routers_initialized_)
     return;
@@ skipping 2170 matching lines @@
 
 ExtensionService::NaClModuleInfoList::iterator
     ExtensionService::FindNaClModule(const GURL& url) {
   for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
        iter != nacl_module_list_.end(); ++iter) {
     if (iter->url == url)
       return iter;
   }
   return nacl_module_list_.end();
 }