chrome/browser/sync/test/integration/migration_errors_test.cc - Issue 7841007: Rename browser/sync/test/live_sync directory to browser/sync/test/integration

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 7841007: Rename browser/sync/test/live_sync directory to browser/sync/test/integration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: "" Created 9 years, 3 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/many_client_preferences_sync_test.cc ('k') | chrome/browser/sync/test/integration/multiple_client_bookmarks_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/migration_errors_test.cc

diff --git a/chrome/browser/sync/test/live_sync/migration_errors_test.cc b/chrome/browser/sync/test/integration/migration_errors_test.cc

similarity index 98%

rename from chrome/browser/sync/test/live_sync/migration_errors_test.cc

rename to chrome/browser/sync/test/integration/migration_errors_test.cc

index febefc8907d889db61192d91632dd6fb514b8e98..868e5738e625ac5346dedc2c19195e3b35110183 100644

--- a/chrome/browser/sync/test/live_sync/migration_errors_test.cc

+++ b/chrome/browser/sync/test/integration/migration_errors_test.cc

@@ -7,9 +7,9 @@

#include "chrome/browser/prefs/scoped_user_pref_update.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/sync/profile_sync_service_harness.h"

-#include "chrome/browser/sync/test/live_sync/bookmarks_helper.h"

-#include "chrome/browser/sync/test/live_sync/live_sync_test.h"

-#include "chrome/browser/sync/test/live_sync/preferences_helper.h"

+#include "chrome/browser/sync/test/integration/bookmarks_helper.h"

+#include "chrome/browser/sync/test/integration/sync_test.h"

+#include "chrome/browser/sync/test/integration/preferences_helper.h"

#include "chrome/browser/translate/translate_prefs.h"

#include "chrome/common/pref_names.h"

#include "chrome/test/base/ui_test_utils.h"

@@ -68,9 +68,9 @@ MigrationList MakeList(syncable::ModelType type1,

return MakeList(MakeSet(type1), MakeSet(type2));

}

-class MigrationTest : public LiveSyncTest {

+class MigrationTest : public SyncTest {

public:

- explicit MigrationTest(TestType test_type) : LiveSyncTest(test_type) {}

+ explicit MigrationTest(TestType test_type) : SyncTest(test_type) {}

virtual ~MigrationTest() {}

// TODO(akalin): Add more MODIFY_(data type) trigger methods, as