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

chrome/browser/extensions/syncable_extension_settings_storage.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_SYNCABLE_EXTENSION_SETTINGS_STORAGE_H_
 #define CHROME_BROWSER_EXTENSIONS_SYNCABLE_EXTENSION_SETTINGS_STORAGE_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 23 matching lines @@
   virtual Result Get() OVERRIDE;
   virtual Result Set(const std::string& key, const Value& value) OVERRIDE;
   virtual Result Set(const DictionaryValue& settings) OVERRIDE;
   virtual Result Remove(const std::string& key) OVERRIDE;
   virtual Result Remove(const std::vector<std::string>& keys) OVERRIDE;
   virtual Result Clear() OVERRIDE;
 
   // Sync-related methods, analogous to those on SyncableService (handled by
   // ExtensionSettings).
   SyncError StartSyncing(
+      // Either EXTENSION_SETTINGS or APP_SETTINGS.
+      syncable::ModelType type,
       const DictionaryValue& sync_state,
       // Must NOT be NULL. Ownership NOT taken.
       SyncChangeProcessor* sync_processor);
   void StopSyncing();
   std::vector<SyncError> ProcessSyncChanges(
       const ExtensionSettingSyncDataList& sync_changes);
 
  private:
   // Either adds to sync or send updates to sync for some settings.
   // Whether they're adds or updates depends on the state of |synced_keys_|.
@@ skipping 31 matching lines @@
   // List of observers to settings changes.
   const scoped_refptr<ObserverListThreadSafe<ExtensionSettingsObserver> >
       observers_;
 
   // Id of the extension these settings are for.
   std::string const extension_id_;
 
   // Storage area to sync.
   const scoped_ptr<ExtensionSettingsStorage> delegate_;
 
+  // Sync model type.  Either EXTENSION_SETTINGS or APP_SETTINGS while sync is
+  // enabled (between calls to Start/StopSyncing), or UNSPECIFIED while not.
+  syncable::ModelType sync_type_;
+
   // Sync processor.  Non-NULL while sync is enabled (between calls to
   // StartSyncing and StopSyncing).
   SyncChangeProcessor* sync_processor_;
 
   // Keys of the settings that are currently being synced.  Only used to decide
   // whether an ACTION_ADD or ACTION_UPDATE should be sent to sync on a Set().
   std::set<std::string> synced_keys_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncableExtensionSettingsStorage);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_SYNCABLE_EXTENSION_SETTINGS_STORAGE_H_