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

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

 // Copyright (c) 2012 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_API_STORAGE_SYNCABLE_SETTINGS_STORAGE_H_
 #define CHROME_BROWSER_EXTENSIONS_API_STORAGE_SYNCABLE_SETTINGS_STORAGE_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/storage/setting_sync_data.h"
 #include "chrome/browser/extensions/api/storage/settings_observer.h"
 #include "chrome/browser/value_store/value_store.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/syncable_service.h"
 
 namespace extensions {
 
 class SettingsSyncProcessor;
 
 // Decorates a ValueStore with sync behaviour.
 class SyncableSettingsStorage : public ValueStore {
  public:
   SyncableSettingsStorage(
       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();
 
   // ValueStore implementation.
   virtual size_t GetBytesInUse(const std::string& key) OVERRIDE;
   virtual size_t GetBytesInUse(const std::vector<std::string>& keys) OVERRIDE;
   virtual size_t GetBytesInUse() OVERRIDE;
   virtual ReadResult Get(const std::string& key) OVERRIDE;
   virtual ReadResult Get(const std::vector<std::string>& keys) OVERRIDE;
   virtual ReadResult Get() OVERRIDE;
@@ skipping 56 matching lines @@
 
   // Id of the extension these settings are for.
   std::string const extension_id_;
 
   // Storage area to sync.
   const scoped_ptr<ValueStore> delegate_;
 
   // 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);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_STORAGE_SYNCABLE_SETTINGS_STORAGE_H_