chrome/browser/sync/profile_sync_service_session_unittest.cc - Issue 10662035: [Sync] Put everything in sync/api into csync namespace

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

Issue 10662035: [Sync] Put everything in sync/api into csync namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix 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/profile_sync_service_preference_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_startup_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_session_unittest.cc

diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc

index feb93677a4c7dd365f8ce0a4c8e3f85b7a7bcddd..b92b0d4f7f36d40cd50ca5c4c0063d89e4bde955 100644

--- a/chrome/browser/sync/profile_sync_service_session_unittest.cc

+++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc

@@ -1013,7 +1013,7 @@ TEST_F(ProfileSyncServiceSessionTest, DISABLED_MissingHeaderAndTab) {

NavigateAndCommitActiveTab(GURL("http://bar2"));

CreateRootHelper create_root(this);

ASSERT_TRUE(StartSyncService(create_root.callback(), false));

- SyncError error;

+ csync::SyncError error;

std::string local_tag = model_associator_->GetCurrentMachineTag();

error = model_associator_->DisassociateModels();

@@ -1044,7 +1044,7 @@ TEST_F(ProfileSyncServiceSessionTest, DISABLED_MultipleHeaders) {

NavigateAndCommitActiveTab(GURL("http://bar2"));

CreateRootHelper create_root(this);

ASSERT_TRUE(StartSyncService(create_root.callback(), false));

- SyncError error;

+ csync::SyncError error;

std::string local_tag = model_associator_->GetCurrentMachineTag();

error = model_associator_->DisassociateModels();

@@ -1076,7 +1076,7 @@ TEST_F(ProfileSyncServiceSessionTest, DISABLED_CorruptedForeign) {

NavigateAndCommitActiveTab(GURL("http://bar2"));

CreateRootHelper create_root(this);

ASSERT_TRUE(StartSyncService(create_root.callback(), false));

- SyncError error;

+ csync::SyncError error;

error = model_associator_->DisassociateModels();

ASSERT_FALSE(error.IsSet());

@@ -1109,7 +1109,7 @@ TEST_F(ProfileSyncServiceSessionTest, DISABLED_MissingLocalTabNode) {

CreateRootHelper create_root(this);

ASSERT_TRUE(StartSyncService(create_root.callback(), false));

std::string local_tag = model_associator_->GetCurrentMachineTag();

- SyncError error;

+ csync::SyncError error;

error = model_associator_->DisassociateModels();

ASSERT_FALSE(error.IsSet());

@@ -1182,7 +1182,7 @@ TEST_F(ProfileSyncServiceSessionTest, DISABLED_CorruptedLocalHeader) {

CreateRootHelper create_root(this);

ASSERT_TRUE(StartSyncService(create_root.callback(), false));

std::string local_tag = model_associator_->GetCurrentMachineTag();

- SyncError error;

+ csync::SyncError error;

error = model_associator_->DisassociateModels();

ASSERT_FALSE(error.IsSet());