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

chrome/browser/extensions/api/storage/settings_backend.cc

 // 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.
 
 #include "chrome/browser/extensions/api/storage/settings_backend.h"
 
 #include "base/files/file_enumerator.h"
 #include "base/logging.h"
 #include "chrome/browser/extensions/api/storage/settings_sync_processor.h"
 #include "chrome/browser/extensions/api/storage/settings_sync_util.h"
@@ skipping 48 matching lines @@
   CHECK(storage);
 
   // It's fine to create the quota enforcer underneath the sync layer, since
   // sync will only go ahead if each underlying storage operation succeeds.
   storage = new SettingsStorageQuotaEnforcer(quota_, storage);
 
   linked_ptr<SyncableSettingsStorage> syncable_storage(
       new SyncableSettingsStorage(
           observers_,
           extension_id,
-          storage));
+          storage,
+          sync_type_,
+          flare_));
   storage_objs_[extension_id] = syncable_storage;
 
   if (sync_processor_.get()) {
     syncer::SyncError error =
         syncable_storage->StartSyncing(
             sync_data,
             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();
 }
 
 void SettingsBackend::DeleteStorage(const std::string& extension_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   // Clear settings when the extension is uninstalled.  Leveldb implementations
   // will also delete the database from disk when the object is destroyed as a
   // result of being removed from |storage_objs_|.
   //
@@ skipping 185 matching lines @@
 scoped_ptr<SettingsSyncProcessor> SettingsBackend::CreateSettingsSyncProcessor(
     const std::string& extension_id) const {
   CHECK(sync_processor_.get());
   return scoped_ptr<SettingsSyncProcessor>(
       new SettingsSyncProcessor(extension_id,
                                 sync_type_,
                                 sync_processor_.get()));
 }
 
 }  // namespace extensions