components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc - Issue 1966023002: [Sync] Move DataTypeErrorHandler to //sync.

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: components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc

Issue 1966023002: [Sync] Move DataTypeErrorHandler to //sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Found an unsaved buffer :( Created 4 years, 7 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 | « components/browser_sync/browser/profile_sync_components_factory_impl.cc ('k') | components/browser_sync/browser/profile_sync_service_typed_url_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc

diff --git a/components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc b/components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc

index 4d4644c195c673d8f92ebee5eece62b95182fdbc..5740c2273953b456629da47c3816d81b82cd9966 100644

--- a/components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc

+++ b/components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc

@@ -38,14 +38,14 @@

#include "components/browser_sync/browser/profile_sync_test_util.h"

#include "components/sync_bookmarks/bookmark_change_processor.h"

#include "components/sync_bookmarks/bookmark_model_associator.h"

-#include "components/sync_driver/data_type_error_handler.h"

-#include "components/sync_driver/data_type_error_handler_mock.h"

#include "components/sync_driver/fake_sync_client.h"

#include "sync/api/sync_error.h"

#include "sync/api/sync_merge_result.h"

#include "sync/internal_api/public/change_record.h"

+#include "sync/internal_api/public/data_type_error_handler.h"

#include "sync/internal_api/public/read_node.h"

#include "sync/internal_api/public/read_transaction.h"

+#include "sync/internal_api/public/test/data_type_error_handler_mock.h"

#include "sync/internal_api/public/test/test_user_share.h"

#include "sync/internal_api/public/write_node.h"

#include "sync/internal_api/public/write_transaction.h"

@@ -791,7 +791,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {

sync_client_.get(), model_associator_.get(), &mock_error_handler_));

}

- sync_driver::DataTypeErrorHandlerMock* mock_error_handler() {

+ syncer::DataTypeErrorHandlerMock* mock_error_handler() {

return &mock_error_handler_;

}

@@ -814,7 +814,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {

std::unique_ptr<BookmarkModel> model_;

syncer::TestUserShare test_user_share_;

std::unique_ptr<BookmarkChangeProcessor> change_processor_;

- StrictMock<sync_driver::DataTypeErrorHandlerMock> mock_error_handler_;

+ StrictMock<syncer::DataTypeErrorHandlerMock> mock_error_handler_;

std::unique_ptr<BookmarkModelAssociator> model_associator_;

std::unique_ptr<bookmarks::ManagedBookmarkService> managed_bookmark_service_;