components/sync_driver/data_type_controller_mock.h - Issue 1314903004: Sync: Refactoring DataTypeController to make the design shareable with USS datatypes.

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/sync_driver/data_type_controller_mock.h

Issue 1314903004: Sync: Refactoring DataTypeController to make the design shareable with USS datatypes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing build on Android Created 5 years, 4 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/sync/profile_sync_service_autofill_unittest.cc ('K') | « components/sync_driver/data_type_controller.cc ('k') | components/sync_driver/data_type_error_handler_mock.h » ('j') | components/sync_driver/directory_data_type_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync_driver/data_type_controller_mock.h

diff --git a/components/sync_driver/data_type_controller_mock.h b/components/sync_driver/data_type_controller_mock.h

index acc54b9f2a33c26bc0bdebd5ea7b00ba8e5cd452..a5274530f5acd8b54e5b4aa5671c84d779215a1b 100644

--- a/components/sync_driver/data_type_controller_mock.h

+++ b/components/sync_driver/data_type_controller_mock.h

@@ -7,6 +7,7 @@

#include "components/sync_driver/data_type_controller.h"

#include "sync/api/sync_error.h"

+#include "sync/api/sync_merge_result.h"

#include "testing/gmock/include/gmock/gmock.h"

namespace sync_driver {