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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/test/integration/two_client_bookmarks_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_autofill_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_extensions_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_bookmarks_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
index b6d84323de36c95e7c9c2935b195d32be4ef0ef2..e53a618d0e416c124e6da2c616569cbd5ab764a3 100644
--- a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
@@ -1509,12 +1509,12 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, DisableBookmarks) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
- ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncable::BOOKMARKS));
+ ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncer::BOOKMARKS));
ASSERT_TRUE(AddFolder(1, kGenericFolderName) != NULL);
ASSERT_TRUE(AwaitQuiescence());
ASSERT_FALSE(AllModelsMatch());
- ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncable::BOOKMARKS));
+ ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncer::BOOKMARKS));
ASSERT_TRUE(AwaitQuiescence());
ASSERT_TRUE(AllModelsMatch());
}
@@ -1564,7 +1564,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, MC_DuplicateFolders) {
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, MC_DeleteBookmark) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncable::BOOKMARKS));
+ ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncer::BOOKMARKS));
const GURL bar_url("http://example.com/bar");
const GURL other_url("http://example.com/other");
@@ -1585,7 +1585,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, MC_DeleteBookmark) {
ASSERT_FALSE(HasNodeWithURL(0, bar_url));
ASSERT_TRUE(HasNodeWithURL(0, other_url));
- ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncable::BOOKMARKS));
+ ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncer::BOOKMARKS));
ASSERT_TRUE(AwaitQuiescence());
ASSERT_FALSE(HasNodeWithURL(0, bar_url));
@@ -1726,10 +1726,10 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
- ASSERT_TRUE(EnableEncryption(0, syncable::BOOKMARKS));
+ ASSERT_TRUE(EnableEncryption(0, syncer::BOOKMARKS));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(IsEncrypted(0, syncable::BOOKMARKS));
- ASSERT_TRUE(IsEncrypted(1, syncable::BOOKMARKS));
+ ASSERT_TRUE(IsEncrypted(0, syncer::BOOKMARKS));
+ ASSERT_TRUE(IsEncrypted(1, syncer::BOOKMARKS));
ASSERT_TRUE(AllModelsMatchVerifier());
}
@@ -1738,11 +1738,11 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
- ASSERT_TRUE(EnableEncryption(0, syncable::BOOKMARKS));
+ ASSERT_TRUE(EnableEncryption(0, syncer::BOOKMARKS));
ASSERT_TRUE(AddURL(0, IndexedURLTitle(0), GURL(IndexedURL(0))) != NULL);
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(IsEncrypted(0, syncable::BOOKMARKS));
- ASSERT_TRUE(IsEncrypted(1, syncable::BOOKMARKS));
+ ASSERT_TRUE(IsEncrypted(0, syncer::BOOKMARKS));
+ ASSERT_TRUE(IsEncrypted(1, syncer::BOOKMARKS));
ASSERT_TRUE(AllModelsMatchVerifier());
}
@@ -1751,11 +1751,11 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
- ASSERT_TRUE(EnableEncryption(0, syncable::BOOKMARKS));
- ASSERT_TRUE(EnableEncryption(1, syncable::BOOKMARKS));
+ ASSERT_TRUE(EnableEncryption(0, syncer::BOOKMARKS));
+ ASSERT_TRUE(EnableEncryption(1, syncer::BOOKMARKS));
ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(IsEncrypted(0, syncable::BOOKMARKS));
- ASSERT_TRUE(IsEncrypted(1, syncable::BOOKMARKS));
+ ASSERT_TRUE(IsEncrypted(0, syncer::BOOKMARKS));
+ ASSERT_TRUE(IsEncrypted(1, syncer::BOOKMARKS));
ASSERT_TRUE(AllModelsMatchVerifier());
}
@@ -1764,16 +1764,16 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(AllModelsMatchVerifier());
- ASSERT_TRUE(EnableEncryption(0, syncable::BOOKMARKS));
+ ASSERT_TRUE(EnableEncryption(0, syncer::BOOKMARKS));
ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(IsEncrypted(0, syncable::BOOKMARKS));
- ASSERT_TRUE(IsEncrypted(1, syncable::BOOKMARKS));
+ ASSERT_TRUE(IsEncrypted(0, syncer::BOOKMARKS));
+ ASSERT_TRUE(IsEncrypted(1, syncer::BOOKMARKS));
ASSERT_TRUE(AddURL(0, IndexedURLTitle(0), GURL(IndexedURL(0))) != NULL);
ASSERT_TRUE(AddURL(0, IndexedURLTitle(1), GURL(IndexedURL(1))) != NULL);
ASSERT_TRUE(AwaitQuiescence());
ASSERT_TRUE(AllModelsMatchVerifier());
- ASSERT_TRUE(IsEncrypted(0, syncable::BOOKMARKS));
- ASSERT_TRUE(IsEncrypted(1, syncable::BOOKMARKS));
+ ASSERT_TRUE(IsEncrypted(0, syncer::BOOKMARKS));
+ ASSERT_TRUE(IsEncrypted(1, syncer::BOOKMARKS));
}
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
@@ -1782,10 +1782,10 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AllModelsMatchVerifier());
ASSERT_TRUE(AddURL(0, IndexedURLTitle(0), GURL(IndexedURL(0))) != NULL);
- ASSERT_TRUE(EnableEncryption(0, syncable::BOOKMARKS));
+ ASSERT_TRUE(EnableEncryption(0, syncer::BOOKMARKS));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(IsEncrypted(0, syncable::BOOKMARKS));
- ASSERT_TRUE(IsEncrypted(1, syncable::BOOKMARKS));
+ ASSERT_TRUE(IsEncrypted(0, syncer::BOOKMARKS));
+ ASSERT_TRUE(IsEncrypted(1, syncer::BOOKMARKS));
ASSERT_TRUE(AllModelsMatchVerifier());
ASSERT_TRUE(AddURL(0, IndexedURLTitle(1), GURL(IndexedURL(1))) != NULL);
@@ -1810,10 +1810,10 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
// understand the bookmark updates.
SetEncryptionPassphrase(0, kValidPassphrase, ProfileSyncService::EXPLICIT);
ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());
- ASSERT_TRUE(EnableEncryption(0, syncable::BOOKMARKS));
+ ASSERT_TRUE(EnableEncryption(0, syncer::BOOKMARKS));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(IsEncrypted(0, syncable::BOOKMARKS));
- ASSERT_TRUE(IsEncrypted(1, syncable::BOOKMARKS));
+ ASSERT_TRUE(IsEncrypted(0, syncer::BOOKMARKS));
+ ASSERT_TRUE(IsEncrypted(1, syncer::BOOKMARKS));
ASSERT_TRUE(GetClient(1)->service()->IsPassphraseRequired());
ASSERT_GT(GetClient(1)->GetLastSessionSnapshot().num_encryption_conflicts(),
3); // The encrypted nodes.
« no previous file with comments | « chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698