sync: fix the way extension/app settings trigger deferred sync init

chrome/browser/extensions/api/storage/syncable_settings_storage.h

Index: chrome/browser/extensions/api/storage/syncable_settings_storage.h
diff --git a/chrome/browser/extensions/api/storage/syncable_settings_storage.h b/chrome/browser/extensions/api/storage/syncable_settings_storage.h
index bffc8292de496544e79a405e2b88c219d8ea0c37..3c04f3b45460b5ad64960c64c616c260916a56e9 100644
--- a/chrome/browser/extensions/api/storage/syncable_settings_storage.h
+++ b/chrome/browser/extensions/api/storage/syncable_settings_storage.h
@@ -27,7 +27,9 @@ class SyncableSettingsStorage : public ValueStore {
       const scoped_refptr<SettingsObserverList>& observers,
       const std::string& extension_id,
       // Ownership taken.
-      ValueStore* delegate);
+      ValueStore* delegate,
+      syncer::ModelType sync_type,
+      const syncer::SyncableService::StartSyncFlare& flare);
 
   virtual ~SyncableSettingsStorage();
 
@@ -104,6 +106,9 @@ class SyncableSettingsStorage : public ValueStore {
   // Object which sends changes to sync.
   scoped_ptr<SettingsSyncProcessor> sync_processor_;
 
+  const syncer::ModelType sync_type_;
+  const syncer::SyncableService::StartSyncFlare flare_;
+
   DISALLOW_COPY_AND_ASSIGN(SyncableSettingsStorage);
 };