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

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

Issue 195873020: [Sync] Move SyncPrefs into sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rerererebase Created 6 years, 9 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/browser/sync/sync_prefs_unittest.cc ('k') | chrome/browser/sync/test_profile_sync_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b5bb784cb5381e07dbcc3f9d18490a27c5635c38..3efadea4f9f99c1734422604617ea943d33971ae 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
@@ -9,6 +9,7 @@
#include "chrome/browser/translate/translate_tab_helper.h"
#include "chrome/common/pref_names.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
+#include "components/sync_driver/pref_names.h"
#include "components/translate/core/browser/translate_prefs.h"
#include "components/translate/core/common/translate_pref_names.h"
@@ -75,11 +76,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
DisableVerifier();
- ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncKeepEverythingSynced));
- ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncThemes));
+ ASSERT_TRUE(
+ BooleanPrefMatches(sync_driver::prefs::kSyncKeepEverythingSynced));
+ ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncThemes));
GetClient(0)->DisableSyncForDatatype(syncer::THEMES);
- ASSERT_FALSE(BooleanPrefMatches(prefs::kSyncKeepEverythingSynced));
+ ASSERT_FALSE(
+ BooleanPrefMatches(sync_driver::prefs::kSyncKeepEverythingSynced));
}
// TCM ID - 3661290.
@@ -87,7 +90,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, DisablePreferences) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
DisableVerifier();
- ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncPreferences));
+ ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncPreferences));
ASSERT_TRUE(BooleanPrefMatches(prefs::kPasswordManagerEnabled));
GetClient(1)->DisableSyncForDatatype(syncer::PREFERENCES);
@@ -105,7 +108,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, DisableSync) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
DisableVerifier();
- ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncPreferences));
+ ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncPreferences));
ASSERT_TRUE(BooleanPrefMatches(prefs::kPasswordManagerEnabled));
ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
@@ -128,12 +131,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, SignInDialog) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
DisableVerifier();
- ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncPreferences));
- ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncBookmarks));
- ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncThemes));
- ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncExtensions));
- ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncAutofill));
- ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncKeepEverythingSynced));
+ ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncPreferences));
+ ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncBookmarks));
+ ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncThemes));
+ ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncExtensions));
+ ASSERT_TRUE(BooleanPrefMatches(sync_driver::prefs::kSyncAutofill));
+ ASSERT_TRUE(
+ BooleanPrefMatches(sync_driver::prefs::kSyncKeepEverythingSynced));
GetClient(0)->DisableSyncForDatatype(syncer::PREFERENCES);
GetClient(1)->EnableSyncForDatatype(syncer::PREFERENCES);
@@ -148,12 +152,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, SignInDialog) {
ASSERT_TRUE(AwaitQuiescence());
- ASSERT_FALSE(BooleanPrefMatches(prefs::kSyncPreferences));
- ASSERT_FALSE(BooleanPrefMatches(prefs::kSyncBookmarks));
- ASSERT_FALSE(BooleanPrefMatches(prefs::kSyncThemes));
- ASSERT_FALSE(BooleanPrefMatches(prefs::kSyncExtensions));
- ASSERT_FALSE(BooleanPrefMatches(prefs::kSyncAutofill));
- ASSERT_FALSE(BooleanPrefMatches(prefs::kSyncKeepEverythingSynced));
+ ASSERT_FALSE(BooleanPrefMatches(sync_driver::prefs::kSyncPreferences));
+ ASSERT_FALSE(BooleanPrefMatches(sync_driver::prefs::kSyncBookmarks));
+ ASSERT_FALSE(BooleanPrefMatches(sync_driver::prefs::kSyncThemes));
+ ASSERT_FALSE(BooleanPrefMatches(sync_driver::prefs::kSyncExtensions));
+ ASSERT_FALSE(BooleanPrefMatches(sync_driver::prefs::kSyncAutofill));
+ ASSERT_FALSE(
+ BooleanPrefMatches(sync_driver::prefs::kSyncKeepEverythingSynced));
}
// TCM ID - 3666296.
« no previous file with comments | « chrome/browser/sync/sync_prefs_unittest.cc ('k') | chrome/browser/sync/test_profile_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698