chrome/browser/sync/glue/search_engine_data_type_controller_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/glue/search_engine_data_type_controller_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: 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

« chrome/browser/extensions/settings/settings_sync_unittest.cc ('K') | « chrome/browser/sync/glue/password_model_associator.cc ('k') | chrome/browser/sync/glue/session_change_processor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc

diff --git a/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc b/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc

index 1c409c99d7eedc17a214077de24595b558c108e7..ced562a001a7b58b9bd8b164b623536d540c4dd7 100644

--- a/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc

+++ b/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc

@@ -103,7 +103,7 @@ class SyncSearchEngineDataTypeControllerTest : public testing::Test {

scoped_ptr<ProfileSyncComponentsFactoryMock> profile_sync_factory_;

ProfileSyncServiceMock service_;

scoped_ptr<FakeGenericChangeProcessor> change_processor_;

- FakeSyncableService syncable_service_;

+ csync::FakeSyncableService syncable_service_;

StartCallbackMock start_callback_;

ModelLoadCallbackMock model_load_callback_;

};

@@ -161,7 +161,7 @@ TEST_F(SyncSearchEngineDataTypeControllerTest, StartAssociationFailed) {

EXPECT_CALL(start_callback_,

Run(DataTypeController::ASSOCIATION_FAILED, _));

syncable_service_.set_merge_data_and_start_syncing_error(

- SyncError(FROM_HERE, "Error", syncable::SEARCH_ENGINES));

+ csync::SyncError(FROM_HERE, "Error", syncable::SEARCH_ENGINES));

Start();

EXPECT_EQ(DataTypeController::DISABLED, search_engine_dtc_->state());