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

Unified Diff: chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

Issue 7888047: Added Instant preference syncing and tests. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 3 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/test/integration/two_client_preferences_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
index 572ea9584f0325a13be8693d1b268352439f74b7..988044d063f2cfe824a632ee1efad648f25d4326 100644
--- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
@@ -177,6 +177,22 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kShowBookmarkBar) {
ASSERT_TRUE(BooleanPrefMatches(prefs::kShowBookmarkBar));
}
+IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kEnableInstant) {
csharp 2011/09/14 20:13:22 I'm not sure if this test is correctly setup, I ju
Nicolas Zea 2011/09/14 21:32:12 They do not yet, feel free to add them though. See
csharp 2011/09/15 13:39:12 They have been added. On 2011/09/14 21:32:12, nze
+ ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+ ASSERT_TRUE(BooleanPrefMatches(prefs::kInstantConfirmDialogShown));
+ ASSERT_TRUE(BooleanPrefMatches(prefs::kInstantEnabled));
+ ASSERT_TRUE(BooleanPrefMatches(prefs::kInstantEnabledOnce));
+
+ ChangeBooleanPref(0, prefs::kInstantConfirmDialogShown);
+ ChangeBooleanPref(0, prefs::kInstantEnabled);
+ ChangeBooleanPref(0, prefs::kInstantEnabledOnce);
+
+ ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+ ASSERT_TRUE(BooleanPrefMatches(prefs::kInstantConfirmDialogShown));
+ ASSERT_TRUE(BooleanPrefMatches(prefs::kInstantEnabled));
+ ASSERT_TRUE(BooleanPrefMatches(prefs::kInstantEnabledOnce));
+}
+
// TCM ID - 3611311.
IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kCheckDefaultBrowser) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
« chrome/browser/instant/instant_controller.cc ('K') | « chrome/browser/instant/instant_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698