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

Unified Diff: chrome/browser/sync/test/integration/two_client_sessions_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
Index: chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
index 4a9b02e004a2fb81c73e65416695c147671ebb67..50d0a41c67845ee0054ff31038bcebcbcd38f541 100644
--- a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
@@ -66,15 +66,15 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
ASSERT_TRUE(CheckInitialState(0));
ASSERT_TRUE(CheckInitialState(1));
- ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
+ ASSERT_TRUE(EnableEncryption(0, syncer::SESSIONS));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(IsEncrypted(0, syncable::SESSIONS));
- ASSERT_TRUE(IsEncrypted(1, syncable::SESSIONS));
+ ASSERT_TRUE(IsEncrypted(0, syncer::SESSIONS));
+ ASSERT_TRUE(IsEncrypted(1, syncer::SESSIONS));
// Should enable encryption for all other types as well. Just check a subset.
- ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES));
- ASSERT_TRUE(IsEncrypted(1, syncable::BOOKMARKS));
- ASSERT_TRUE(IsEncrypted(1, syncable::APPS));
+ ASSERT_TRUE(IsEncrypted(1, syncer::PREFERENCES));
+ ASSERT_TRUE(IsEncrypted(1, syncer::BOOKMARKS));
+ ASSERT_TRUE(IsEncrypted(1, syncer::APPS));
}
IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
@@ -87,11 +87,11 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
ScopedWindowMap client0_windows;
ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1),
client0_windows.GetMutable()));
- ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
+ ASSERT_TRUE(EnableEncryption(0, syncer::SESSIONS));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
// Get foreign session data from client 1.
- ASSERT_TRUE(IsEncrypted(1, syncable::SESSIONS));
+ ASSERT_TRUE(IsEncrypted(1, syncer::SESSIONS));
SyncedSessionVector sessions1;
ASSERT_TRUE(GetSessionData(1, &sessions1));
@@ -107,11 +107,11 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
ASSERT_TRUE(CheckInitialState(0));
ASSERT_TRUE(CheckInitialState(1));
- ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
- ASSERT_TRUE(EnableEncryption(1, syncable::SESSIONS));
+ ASSERT_TRUE(EnableEncryption(0, syncer::SESSIONS));
+ ASSERT_TRUE(EnableEncryption(1, syncer::SESSIONS));
ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(IsEncrypted(0, syncable::SESSIONS));
- ASSERT_TRUE(IsEncrypted(1, syncable::SESSIONS));
+ ASSERT_TRUE(IsEncrypted(0, syncer::SESSIONS));
+ ASSERT_TRUE(IsEncrypted(1, syncer::SESSIONS));
}
IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, BothChanged) {

Powered by Google App Engine
This is Rietveld 408576698