chrome/browser/sync/test/integration/sync_errors_test.cc - Issue 10698014: [Sync] Rename csync namespace to syncer

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/sync_errors_test.cc

Issue 10698014: [Sync] Rename csync namespace to syncer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments 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

« no previous file with comments | « chrome/browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc ('k') | chrome/browser/sync/test/integration/sync_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e40f1d176c2c1250df78fe5983e10aa6e8720421..d8fd3e0be0ce4e1dbb6c5411bd4fd3c3052fdf73 100644

--- a/chrome/browser/sync/test/integration/sync_errors_test.cc

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

@@ -61,9 +61,9 @@ IN_PROC_BROWSER_TEST_F(SyncErrorTest, ActionableErrorTest) {

SetTitle(0, node1, L"new_title1");

ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Sync."));

- csync::SyncProtocolError protocol_error;

- protocol_error.error_type = csync::TRANSIENT_ERROR;

- protocol_error.action = csync::UPGRADE_CLIENT;

+ syncer::SyncProtocolError protocol_error;

+ protocol_error.error_type = syncer::TRANSIENT_ERROR;

+ protocol_error.action = syncer::UPGRADE_CLIENT;

protocol_error.error_description = "Not My Fault";

protocol_error.url = "www.google.com";

TriggerSyncError(protocol_error, SyncTest::ERROR_FREQUENCY_ALWAYS);

@@ -84,8 +84,8 @@ IN_PROC_BROWSER_TEST_F(SyncErrorTest, ActionableErrorTest) {

IN_PROC_BROWSER_TEST_F(SyncErrorTest, ErrorWhileSettingUp) {

ASSERT_TRUE(SetupClients());

- csync::SyncProtocolError protocol_error;

- protocol_error.error_type = csync::TRANSIENT_ERROR;

+ syncer::SyncProtocolError protocol_error;

+ protocol_error.error_type = syncer::TRANSIENT_ERROR;

protocol_error.error_description = "Not My Fault";

protocol_error.url = "www.google.com";

@@ -120,9 +120,9 @@ IN_PROC_BROWSER_TEST_F(SyncErrorTest,

SetTitle(0, node1, L"new_title1");

ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Sync."));

- csync::SyncProtocolError protocol_error;

- protocol_error.error_type = csync::NOT_MY_BIRTHDAY;

- protocol_error.action = csync::DISABLE_SYNC_ON_CLIENT;

+ syncer::SyncProtocolError protocol_error;

+ protocol_error.error_type = syncer::NOT_MY_BIRTHDAY;

+ protocol_error.action = syncer::DISABLE_SYNC_ON_CLIENT;

protocol_error.error_description = "Not My Fault";

protocol_error.url = "www.google.com";

TriggerSyncError(protocol_error, SyncTest::ERROR_FREQUENCY_ALWAYS);