components/sync/driver/data_type_controller_mock.h - Issue 2203673002: [Sync] Move //components/sync_driver to //components/sync/driver.

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 2203673002: [Sync] Move //components/sync_driver to //components/sync/driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sd-a

Patch Set: Full change rebased on static lib. Created 4 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

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

similarity index 74%

rename from components/sync_driver/data_type_controller_mock.h

rename to components/sync/driver/data_type_controller_mock.h

index 516fe939c283ef73ed5a27b535f56eb81541c1d8..7c37a7e9aaf89b17e494825b5e75f245b12f876a 100644

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

+++ b/components/sync/driver/data_type_controller_mock.h

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

#include "components/sync/api/sync_error.h"

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

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

+#include "components/sync/driver/data_type_controller.h"

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

namespace sync_driver {

@@ -17,9 +17,10 @@ class StartCallbackMock {

StartCallbackMock();

virtual ~StartCallbackMock();

- MOCK_METHOD3(Run, void(DataTypeController::ConfigureResult result,

- const syncer::SyncMergeResult& local_merge_result,

- const syncer::SyncMergeResult& syncer_merge_result));

+ MOCK_METHOD3(Run,

+ void(DataTypeController::ConfigureResult result,

+ const syncer::SyncMergeResult& local_merge_result,

+ const syncer::SyncMergeResult& syncer_merge_result));

};

class ModelLoadCallbackMock {

« no previous file with comments | « components/sync/driver/data_type_controller.cc ('k') | components/sync/driver/data_type_controller_mock.cc » ('j') | no next file with comments »