chrome/browser/sync/test/integration/two_client_preferences_sync_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/two_client_preferences_sync_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/two_client_passwords_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

similarity index 99%

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

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

index 60ef8902636cf180e222a49d2ea49411077e941c..572ea9584f0325a13be8693d1b268352439f74b7 100644

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

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

@@ -5,8 +5,8 @@

#include "base/values.h"

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

#include "chrome/browser/translate/translate_prefs.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/sync_test.h"

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

#include "chrome/common/pref_names.h"

using preferences_helper::AppendStringPref;

@@ -20,9 +20,9 @@ using preferences_helper::IntegerPrefMatches;

using preferences_helper::ListPrefMatches;

using preferences_helper::StringPrefMatches;

-class TwoClientPreferencesSyncTest : public LiveSyncTest {

+class TwoClientPreferencesSyncTest : public SyncTest {

public:

- TwoClientPreferencesSyncTest() : LiveSyncTest(TWO_CLIENT) {}

+ TwoClientPreferencesSyncTest() : SyncTest(TWO_CLIENT) {}

virtual ~TwoClientPreferencesSyncTest() {}

private: