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

Unified Diff: chrome/test/live_sync/live_sync_test.cc

Issue 7655055: [Sync] Make BackendMigrator not wait for full sync cycles (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address more comments Created 9 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
« no previous file with comments | « chrome/test/live_sync/live_sync_test.h ('k') | chrome/test/live_sync/migration_errors_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/live_sync/live_sync_test.cc
diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc
index a3f94b9951f98fc932d8cb112b6cb49ed1178fb9..ed5d2717044a41edf5c75558929db2ed3cfe46b3 100644
--- a/chrome/test/live_sync/live_sync_test.cc
+++ b/chrome/test/live_sync/live_sync_test.cc
@@ -534,7 +534,7 @@ bool LiveSyncTest::AwaitQuiescence() {
return ProfileSyncServiceHarness::AwaitQuiescence(clients());
}
-bool LiveSyncTest::ServerSupportsNotificationControl() {
+bool LiveSyncTest::ServerSupportsNotificationControl() const {
EXPECT_NE(SERVER_TYPE_UNDECIDED, server_type_);
// Supported only if we're using the python testserver.
@@ -549,6 +549,14 @@ void LiveSyncTest::DisableNotifications() {
UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle()));
}
+void LiveSyncTest::EnableNotifications() {
+ ASSERT_TRUE(ServerSupportsNotificationControl());
+ std::string path = "chromiumsync/enablenotifications";
+ ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
+ ASSERT_EQ("Notifications enabled",
+ UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle()));
+}
+
void LiveSyncTest::TriggerNotification(
const syncable::ModelTypeSet& changed_types) {
ASSERT_TRUE(ServerSupportsNotificationControl());
@@ -564,7 +572,7 @@ void LiveSyncTest::TriggerNotification(
UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle()));
}
-bool LiveSyncTest::ServerSupportsErrorTriggering() {
+bool LiveSyncTest::ServerSupportsErrorTriggering() const {
EXPECT_NE(SERVER_TYPE_UNDECIDED, server_type_);
// Supported only if we're using the python testserver.
« no previous file with comments | « chrome/test/live_sync/live_sync_test.h ('k') | chrome/test/live_sync/migration_errors_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698