chrome/browser/sync/test/integration/two_client_bookmarks_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_bookmarks_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_autofill_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_extensions_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_bookmarks_sync_test.cc

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

similarity index 99%

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

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

index 869be0e8920c8c0095c541d997ff009e68dc71a5..de69bc99d1b087757387e39e2b61f1f924fbfb4b 100644

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

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

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

#include "base/rand_util.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/integration/bookmarks_helper.h"

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

using bookmarks_helper::AddFolder;

using bookmarks_helper::AddURL;

@@ -37,9 +37,9 @@ const std::wstring kGenericFolderName = L"Folder Name";

const std::wstring kGenericSubfolderName = L"Subfolder Name";

const std::wstring kGenericSubsubfolderName = L"Subsubfolder Name";

-class TwoClientBookmarksSyncTest : public LiveSyncTest {

+class TwoClientBookmarksSyncTest : public SyncTest {

public:

- TwoClientBookmarksSyncTest() : LiveSyncTest(TWO_CLIENT) {}

+ TwoClientBookmarksSyncTest() : SyncTest(TWO_CLIENT) {}

virtual ~TwoClientBookmarksSyncTest() {}

private: