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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights Created 8 years, 6 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/test/integration/two_client_passwords_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc » ('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 6c728627f30b8de8c953b9d9ae1f5f9130fdd7f5..1110fb8d8195a9e9ec10cc92401f7f4cb7552afd 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
@@ -4,9 +4,9 @@
#include "base/values.h"
#include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/translate/translate_prefs.h"
-#include "chrome/browser/sync/test/integration/sync_test.h"
#include "chrome/browser/sync/test/integration/preferences_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
+#include "chrome/browser/translate/translate_prefs.h"
#include "chrome/common/pref_names.h"
using preferences_helper::AppendStringPref;
@@ -82,7 +82,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
prefs::kSyncKeepEverythingSynced));
ASSERT_TRUE(BooleanPrefMatches(prefs::kSyncThemes));
- GetClient(0)->DisableSyncForDatatype(syncable::THEMES);
+ GetClient(0)->DisableSyncForDatatype(syncer::THEMES);
ASSERT_FALSE(BooleanPrefMatches(
prefs::kSyncKeepEverythingSynced));
}
@@ -96,13 +96,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, DisablePreferences) {
ASSERT_TRUE(BooleanPrefMatches(
prefs::kPasswordManagerEnabled));
- GetClient(1)->DisableSyncForDatatype(syncable::PREFERENCES);
+ GetClient(1)->DisableSyncForDatatype(syncer::PREFERENCES);
ChangeBooleanPref(0, prefs::kPasswordManagerEnabled);
ASSERT_TRUE(AwaitQuiescence());
ASSERT_FALSE(BooleanPrefMatches(
prefs::kPasswordManagerEnabled));
- GetClient(1)->EnableSyncForDatatype(syncable::PREFERENCES);
+ GetClient(1)->EnableSyncForDatatype(syncer::PREFERENCES);
ASSERT_TRUE(AwaitQuiescence());
ASSERT_TRUE(BooleanPrefMatches(
prefs::kPasswordManagerEnabled));
@@ -147,16 +147,16 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, SignInDialog) {
ASSERT_TRUE(BooleanPrefMatches(
prefs::kSyncKeepEverythingSynced));
- GetClient(0)->DisableSyncForDatatype(syncable::PREFERENCES);
- GetClient(1)->EnableSyncForDatatype(syncable::PREFERENCES);
- GetClient(0)->DisableSyncForDatatype(syncable::AUTOFILL);
- GetClient(1)->EnableSyncForDatatype(syncable::AUTOFILL);
- GetClient(0)->DisableSyncForDatatype(syncable::BOOKMARKS);
- GetClient(1)->EnableSyncForDatatype(syncable::BOOKMARKS);
- GetClient(0)->DisableSyncForDatatype(syncable::EXTENSIONS);
- GetClient(1)->EnableSyncForDatatype(syncable::EXTENSIONS);
- GetClient(0)->DisableSyncForDatatype(syncable::THEMES);
- GetClient(1)->EnableSyncForDatatype(syncable::THEMES);
+ GetClient(0)->DisableSyncForDatatype(syncer::PREFERENCES);
+ GetClient(1)->EnableSyncForDatatype(syncer::PREFERENCES);
+ GetClient(0)->DisableSyncForDatatype(syncer::AUTOFILL);
+ GetClient(1)->EnableSyncForDatatype(syncer::AUTOFILL);
+ GetClient(0)->DisableSyncForDatatype(syncer::BOOKMARKS);
+ GetClient(1)->EnableSyncForDatatype(syncer::BOOKMARKS);
+ GetClient(0)->DisableSyncForDatatype(syncer::EXTENSIONS);
+ GetClient(1)->EnableSyncForDatatype(syncer::EXTENSIONS);
+ GetClient(0)->DisableSyncForDatatype(syncer::THEMES);
+ GetClient(1)->EnableSyncForDatatype(syncer::THEMES);
ASSERT_TRUE(AwaitQuiescence());
@@ -615,10 +615,10 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
SingleClientEnabledEncryption) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(EnableEncryption(0, syncable::PREFERENCES));
+ ASSERT_TRUE(EnableEncryption(0, syncer::PREFERENCES));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES));
- ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES));
+ ASSERT_TRUE(IsEncrypted(0, syncer::PREFERENCES));
+ ASSERT_TRUE(IsEncrypted(1, syncer::PREFERENCES));
}
IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
@@ -628,10 +628,10 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
prefs::kHomePageIsNewTabPage));
ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
- ASSERT_TRUE(EnableEncryption(0, syncable::PREFERENCES));
+ ASSERT_TRUE(EnableEncryption(0, syncer::PREFERENCES));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES));
- ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES));
+ ASSERT_TRUE(IsEncrypted(0, syncer::PREFERENCES));
+ ASSERT_TRUE(IsEncrypted(1, syncer::PREFERENCES));
ASSERT_TRUE(BooleanPrefMatches(
prefs::kHomePageIsNewTabPage));
}
@@ -640,11 +640,11 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
BothClientsEnabledEncryption) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(EnableEncryption(0, syncable::PREFERENCES));
- ASSERT_TRUE(EnableEncryption(1, syncable::PREFERENCES));
+ ASSERT_TRUE(EnableEncryption(0, syncer::PREFERENCES));
+ ASSERT_TRUE(EnableEncryption(1, syncer::PREFERENCES));
ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES));
- ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES));
+ ASSERT_TRUE(IsEncrypted(0, syncer::PREFERENCES));
+ ASSERT_TRUE(IsEncrypted(1, syncer::PREFERENCES));
}
IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
@@ -654,13 +654,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
prefs::kHomePageIsNewTabPage));
ASSERT_TRUE(StringPrefMatches(prefs::kHomePage));
- ASSERT_TRUE(EnableEncryption(0, syncable::PREFERENCES));
+ ASSERT_TRUE(EnableEncryption(0, syncer::PREFERENCES));
ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
ChangeStringPref(1, prefs::kHomePage,
"http://www.google.com/1");
ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES));
- ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES));
+ ASSERT_TRUE(IsEncrypted(0, syncer::PREFERENCES));
+ ASSERT_TRUE(IsEncrypted(1, syncer::PREFERENCES));
ASSERT_TRUE(BooleanPrefMatches(
prefs::kHomePageIsNewTabPage));
ASSERT_TRUE(StringPrefMatches(prefs::kHomePage));
@@ -673,10 +673,10 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
prefs::kHomePageIsNewTabPage));
ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
- ASSERT_TRUE(EnableEncryption(0, syncable::PREFERENCES));
+ ASSERT_TRUE(EnableEncryption(0, syncer::PREFERENCES));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES));
- ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES));
+ ASSERT_TRUE(IsEncrypted(0, syncer::PREFERENCES));
+ ASSERT_TRUE(IsEncrypted(1, syncer::PREFERENCES));
ASSERT_TRUE(BooleanPrefMatches(
prefs::kHomePageIsNewTabPage));
« no previous file with comments | « chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698