Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(679)

Unified Diff: chrome/browser/sync/glue/chrome_sync_notification_bridge.h

Issue 10824161: [Sync] Avoid unregistering object IDs on shutdown (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Work around brittle unit test Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/glue/chrome_sync_notification_bridge.h
diff --git a/chrome/browser/sync/glue/chrome_sync_notification_bridge.h b/chrome/browser/sync/glue/chrome_sync_notification_bridge.h
index a878ff711f14e999c7282a637f1108433ef7d8b0..0216df938b61dd95874f2df95b7f8859be1757dc 100644
--- a/chrome/browser/sync/glue/chrome_sync_notification_bridge.h
+++ b/chrome/browser/sync/glue/chrome_sync_notification_bridge.h
@@ -36,11 +36,18 @@ class ChromeSyncNotificationBridge : public content::NotificationObserver {
const scoped_refptr<base::SequencedTaskRunner>& sync_task_runner);
virtual ~ChromeSyncNotificationBridge();
+ // Must be called on the UI thread while the sync task runner is still
+ // around. No other member functions on the sync thread may be called after
+ // this is called.
+ void StopForShutdown();
+
// Must be called on the sync task runner.
void UpdateEnabledTypes(syncer::ModelTypeSet enabled_types);
// Marked virtual for tests.
+ virtual void RegisterHandler(syncer::SyncNotifierObserver* handler);
virtual void UpdateRegisteredIds(syncer::SyncNotifierObserver* handler,
const syncer::ObjectIdSet& ids);
+ virtual void UnregisterHandler(syncer::SyncNotifierObserver* handler);
// NotificationObserver implementation. Called on UI thread.
virtual void Observe(int type,

Powered by Google App Engine
This is Rietveld 408576698