| Index: chrome/test/live_sync/live_sync_test.h
|
| diff --git a/chrome/test/live_sync/live_sync_test.h b/chrome/test/live_sync/live_sync_test.h
|
| index f9f9b15880f6bc88e4db1361633095b0d8670087..0a509fd03f4b8b7a6119adc48cdda575da7348cc 100644
|
| --- a/chrome/test/live_sync/live_sync_test.h
|
| +++ b/chrome/test/live_sync/live_sync_test.h
|
| @@ -136,15 +136,23 @@ class LiveSyncTest : public InProcessBrowserTest {
|
| // Checks if the datatype |type| is encrypted for profile |index|.
|
| bool IsEncrypted(int index, syncable::ModelType type);
|
|
|
| - // Disable notifications for the current test. Must be called
|
| - // before the test server is started (i.e., before either of
|
| - // SetupSync() or SetupClients() is called).
|
| - void DisableNotifications();
|
| -
|
| // Blocks until all sync clients have completed their mutual sync cycles.
|
| // Returns true if a quiescent state was successfully reached.
|
| bool AwaitQuiescence();
|
|
|
| + // Returns true if the server being used supports controlling
|
| + // notifications.
|
| + bool ServerSupportsNotificationControl();
|
| +
|
| + // Disable notifications on the server. This operation is available
|
| + // only if ServerSupportsNotificationControl() returned true.
|
| + void DisableNotifications();
|
| +
|
| + // Trigger a notification to be sent to all clients. This operation
|
| + // is available only if ServerSupportsNotificationControl() returned
|
| + // true.
|
| + void TriggerNotification(const syncable::ModelTypeSet& changed_types);
|
| +
|
| // Returns true if the server being used supports injecting errors.
|
| bool ServerSupportsErrorTriggering();
|
|
|
| @@ -296,9 +304,6 @@ class LiveSyncTest : public InProcessBrowserTest {
|
| // URLFetcher factory used to contact sync server.
|
| scoped_ptr<URLFetcherFactory> integration_factory_;
|
|
|
| - // Whether or not to use notifications for the current test.
|
| - bool enable_notifications_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(LiveSyncTest);
|
| };
|
|
|
|
|