| Index: chrome/browser/extensions/api/storage/settings_backend.cc
|
| diff --git a/chrome/browser/extensions/api/storage/settings_backend.cc b/chrome/browser/extensions/api/storage/settings_backend.cc
|
| index cf6ccad65dbd4ec2bc8173e838e09e2b152e98c7..df2bd134c0fa652bc7092e14042509ef32becf2f 100644
|
| --- a/chrome/browser/extensions/api/storage/settings_backend.cc
|
| +++ b/chrome/browser/extensions/api/storage/settings_backend.cc
|
| @@ -66,7 +66,9 @@ SyncableSettingsStorage* SettingsBackend::GetOrCreateStorageWithSyncData(
|
| new SyncableSettingsStorage(
|
| observers_,
|
| extension_id,
|
| - storage));
|
| + storage,
|
| + sync_type_,
|
| + flare_));
|
| storage_objs_[extension_id] = syncable_storage;
|
|
|
| if (sync_processor_.get()) {
|
| @@ -76,13 +78,7 @@ SyncableSettingsStorage* SettingsBackend::GetOrCreateStorageWithSyncData(
|
| CreateSettingsSyncProcessor(extension_id).Pass());
|
| if (error.IsSet())
|
| syncable_storage.get()->StopSyncing();
|
| - } else {
|
| - // Tell sync to try and start soon, because syncable changes to sync_type_
|
| - // have started happening. This will cause sync to call us back
|
| - // asynchronously via MergeDataAndStartSyncing as soon as possible.
|
| - flare_.Run(sync_type_);
|
| }
|
| -
|
| return syncable_storage.get();
|
| }
|
|
|
|
|