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

chrome/browser/extensions/extension_settings_backend.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SETTINGS_BACKEND_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SETTINGS_BACKEND_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/task.h"
 #include "chrome/browser/extensions/extension_settings_observer.h"
 #include "chrome/browser/extensions/syncable_extension_settings_storage.h"
 #include "chrome/browser/sync/api/syncable_service.h"
 
 // Manages ExtensionSettingsStorage objects for extensions, including routing
 // changes from sync to them.
 // Lives entirely on the FILE thread.
 class ExtensionSettingsBackend : public SyncableService {
  public:
   // |base_path| is the base of the extension settings directory, so the
   // databases will be at base_path/extension_id.
   // |observers| is the list of observers to settings changes.
   explicit ExtensionSettingsBackend(
       const FilePath& base_path,
-      const scoped_refptr<ObserverListThreadSafe<ExtensionSettingsObserver> >&
+      const scoped_refptr<ExtensionSettingsObserverList >&
           observers);
 
   virtual ~ExtensionSettingsBackend();
 
   // Gets a weak reference to the storage area for a given extension.
   // Must be run on the FILE thread.
   //
   // By default this will be an ExtensionSettingsLeveldbStorage, but on
   // failure to create a leveldb instance will fall back to
   // InMemoryExtensionSettingsStorage.
   ExtensionSettingsStorage* GetStorage(
       const std::string& extension_id) const;
 
   // Deletes all setting data for an extension.  Call on the FILE thread.
-  void DeleteExtensionData(const std::string& extension_id);
+  void DeleteStorage(const std::string& extension_id);
 
   // Sends a change event to the observer list.  |profile| is the profile which
   // generated the change.  Must be called on the FILE thread.
   void TriggerOnSettingsChanged(
       Profile* profile,
       const std::string& extension_id,
       const ExtensionSettingChanges& changes) const;
 
   // SyncableService implementation.
   virtual SyncDataList GetAllSyncData(syncable::ModelType type) const OVERRIDE;
@@ skipping 16 matching lines @@
       const std::string& extension_id, const DictionaryValue& sync_data) const;
 
   // Gets all extension IDs known to extension settings.  This may not be all
   // installed extensions.
   std::set<std::string> GetKnownExtensionIDs() const;
 
   // The base file path to create any leveldb databases at.
   const FilePath base_path_;
 
   // The list of observers to settings changes.
-  const scoped_refptr<ObserverListThreadSafe<ExtensionSettingsObserver> >
-      observers_;
+  const scoped_refptr<ExtensionSettingsObserverList> observers_;
 
   // A cache of ExtensionSettingsStorage objects that have already been created.
   // Ensure that there is only ever one created per extension.
   typedef std::map<std::string, linked_ptr<SyncableExtensionSettingsStorage> >
       StorageObjMap;
   mutable StorageObjMap storage_objs_;
 
+  // Current sync model type.  Will be UNSPECIFIED if sync hasn't been enabled
+  // yet, and either EXTENSION_SETTINGS or APP_SETTINGS if it has been.
+  syncable::ModelType sync_type_;
+
   // Current sync processor, if any.
   SyncChangeProcessor* sync_processor_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsBackend);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SETTINGS_BACKEND_H_