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

Side by Side Diff: chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

Issue 10409046: Migrate the rest of the "global" prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments Created 8 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/values.h" 5 #include "base/values.h"
6 #include "chrome/browser/sync/profile_sync_service_harness.h" 6 #include "chrome/browser/sync/profile_sync_service_harness.h"
7 #include "chrome/browser/translate/translate_prefs.h" 7 #include "chrome/browser/translate/translate_prefs.h"
8 #include "chrome/browser/sync/test/integration/sync_test.h" 8 #include "chrome/browser/sync/test/integration/sync_test.h"
9 #include "chrome/browser/sync/test/integration/preferences_helper.h" 9 #include "chrome/browser/sync/test/integration/preferences_helper.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 ASSERT_TRUE(BooleanPrefMatches( 350 ASSERT_TRUE(BooleanPrefMatches(
351 prefs::kWebKitUsesUniversalDetector)); 351 prefs::kWebKitUsesUniversalDetector));
352 352
353 ChangeBooleanPref(0, prefs::kWebKitUsesUniversalDetector); 353 ChangeBooleanPref(0, prefs::kWebKitUsesUniversalDetector);
354 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 354 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
355 ASSERT_TRUE(BooleanPrefMatches( 355 ASSERT_TRUE(BooleanPrefMatches(
356 prefs::kWebKitUsesUniversalDetector)); 356 prefs::kWebKitUsesUniversalDetector));
357 } 357 }
358 358
359 // TCM ID - 3673298. 359 // TCM ID - 3673298.
360 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kGlobalDefaultCharset) { 360 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kDefaultCharset) {
361 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 361 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
362 ASSERT_TRUE(StringPrefMatches(prefs::kGlobalDefaultCharset)); 362 ASSERT_TRUE(StringPrefMatches(prefs::kDefaultCharset));
363 363
364 ChangeStringPref(0, prefs::kGlobalDefaultCharset, "Thai"); 364 ChangeStringPref(0, prefs::kDefaultCharset, "Thai");
365 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 365 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
366 ASSERT_TRUE(StringPrefMatches(prefs::kGlobalDefaultCharset)); 366 ASSERT_TRUE(StringPrefMatches(prefs::kDefaultCharset));
367 } 367 }
368 368
369 // TCM ID - 3653296. 369 // TCM ID - 3653296.
370 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, 370 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
371 kBlockThirdPartyCookies) { 371 kBlockThirdPartyCookies) {
372 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 372 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
373 ASSERT_TRUE(BooleanPrefMatches( 373 ASSERT_TRUE(BooleanPrefMatches(
374 prefs::kBlockThirdPartyCookies)); 374 prefs::kBlockThirdPartyCookies));
375 375
376 ChangeBooleanPref(0, prefs::kBlockThirdPartyCookies); 376 ChangeBooleanPref(0, prefs::kBlockThirdPartyCookies);
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES)); 678 ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES));
679 ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES)); 679 ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES));
680 ASSERT_TRUE(BooleanPrefMatches( 680 ASSERT_TRUE(BooleanPrefMatches(
681 prefs::kHomePageIsNewTabPage)); 681 prefs::kHomePageIsNewTabPage));
682 682
683 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); 683 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
684 ChangeBooleanPref(0, prefs::kShowHomeButton); 684 ChangeBooleanPref(0, prefs::kShowHomeButton);
685 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 685 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
686 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); 686 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
687 } 687 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698