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

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

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

similarity index 96%

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

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

index ce496337acd445fd2a9d31311786fdf3479e3590..0e0b6f542d25dc625e45ab09d3c832d33c096681 100644

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

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

@@ -8,17 +8,17 @@

#include "chrome/browser/history/history_types.h"

#include "chrome/browser/sessions/session_service.h"

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

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

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

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

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

using typed_urls_helper::AddUrlToHistory;

using typed_urls_helper::AssertAllProfilesHaveSameURLsAsVerifier;

using typed_urls_helper::DeleteUrlFromHistory;

using typed_urls_helper::GetTypedUrlsFromClient;

-class TwoClientTypedUrlsSyncTest : public LiveSyncTest {

+class TwoClientTypedUrlsSyncTest : public SyncTest {

public:

- TwoClientTypedUrlsSyncTest() : LiveSyncTest(TWO_CLIENT) {}

+ TwoClientTypedUrlsSyncTest() : SyncTest(TWO_CLIENT) {}

virtual ~TwoClientTypedUrlsSyncTest() {}

private: