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

Unified Diff: chrome/browser/sync/test/integration/sync_test.h

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/sync_test.h
diff --git a/chrome/browser/sync/test/integration/sync_test.h b/chrome/browser/sync/test/integration/sync_test.h
index e30d2cfa690799b4cec9bf78805abfc38669c522..af3c4071dcb75b3993978c08f7b957b0a258b3eb 100644
--- a/chrome/browser/sync/test/integration/sync_test.h
+++ b/chrome/browser/sync/test/integration/sync_test.h
@@ -148,10 +148,10 @@ class SyncTest : public InProcessBrowserTest {
virtual void DisableNetwork(Profile* profile);
// Encrypts the datatype |type| for profile |index|.
- bool EnableEncryption(int index, syncable::ModelType type);
+ bool EnableEncryption(int index, syncer::ModelType type);
// Checks if the datatype |type| is encrypted for profile |index|.
- bool IsEncrypted(int index, syncable::ModelType type);
+ bool IsEncrypted(int index, syncer::ModelType type);
// Blocks until all sync clients have completed their mutual sync cycles.
// Returns true if a quiescent state was successfully reached.
@@ -172,7 +172,7 @@ class SyncTest : public InProcessBrowserTest {
// Trigger a notification to be sent to all clients. This operation
// is available only if ServerSupportsNotificationControl() returned
// true.
- void TriggerNotification(syncable::ModelTypeSet changed_types);
+ void TriggerNotification(syncer::ModelTypeSet changed_types);
// Returns true if the server being used supports injecting errors.
bool ServerSupportsErrorTriggering() const;
@@ -180,7 +180,7 @@ class SyncTest : public InProcessBrowserTest {
// Triggers a migration for one or more datatypes, and waits
// for the server to complete it. This operation is available
// only if ServerSupportsErrorTriggering() returned true.
- void TriggerMigrationDoneError(syncable::ModelTypeSet model_types);
+ void TriggerMigrationDoneError(syncer::ModelTypeSet model_types);
// Triggers the server to set its birthday to a random value thereby
// the server would return a birthday error on next sync.
« no previous file with comments | « chrome/browser/sync/test/integration/sync_errors_test.cc ('k') | chrome/browser/sync/test/integration/sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698