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

Unified Diff: chrome/browser/sync/test/integration/multiple_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/multiple_client_sessions_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/multiple_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_sessions_sync_test.cc
index c6396e39e19b803faeea5f283d37d656a5009a68..a9a4272140647a83edeb8dc2d3231611cac3bddb 100644
--- a/chrome/browser/sync/test/integration/multiple_client_sessions_sync_test.cc
+++ b/chrome/browser/sync/test/integration/multiple_client_sessions_sync_test.cc
@@ -6,8 +6,8 @@
#include "base/stringprintf.h"
#include "chrome/browser/sessions/session_service.h"
#include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/integration/sync_test.h"
#include "chrome/browser/sync/test/integration/sessions_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
using sessions_helper::CheckForeignSessionsAgainst;
using sessions_helper::CheckInitialState;
@@ -70,7 +70,7 @@ IN_PROC_BROWSER_TEST_F(MultipleClientSessionsSyncTest,
}
// Enable encryption on client 0, should propagate to all other clients.
- ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
+ ASSERT_TRUE(EnableEncryption(0, syncer::SESSIONS));
// Wait for sync.
// TODO(zea): Fix sync completion detection so we don't need this. For now,
@@ -92,7 +92,7 @@ IN_PROC_BROWSER_TEST_F(MultipleClientSessionsSyncTest,
// Get foreign session data from all clients and check it against all
// client_windows.
for (int i = 0; i < num_clients(); ++i) {
- ASSERT_TRUE(IsEncrypted(i, syncable::SESSIONS));
+ ASSERT_TRUE(IsEncrypted(i, syncer::SESSIONS));
ASSERT_TRUE(CheckForeignSessionsAgainst(i, client_windows));
}
}

Powered by Google App Engine
This is Rietveld 408576698