chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc - Issue 367153005: Sync: Refactoring of DEVICE_INFO syncable type - Part 1

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

Issue 367153005: Sync: Refactoring of DEVICE_INFO syncable type - Part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed build issues in browser_tests Created 6 years, 5 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/glue/local_device_info_provider_mock.h ('K') | « chrome/browser/sync/glue/sync_backend_host_impl.cc ('k') | chrome/browser/sync/glue/sync_backend_host_mock.cc » ('j') | chrome/browser/sync/sessions/sessions_sync_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8bd0e7c5e05873c344a6f77b4e21f9fc0838f4b2..fb2baa483b39d7139ebb847c2d4d8349486db9e2 100644

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

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

@@ -76,10 +76,11 @@ class MockSyncFrontend : public SyncFrontend {

public:

virtual ~MockSyncFrontend() {}

- MOCK_METHOD3(

+ MOCK_METHOD4(

OnBackendInitialized,

void(const syncer::WeakHandle<syncer::JsBackend>&,

const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&,

+ const std::string&,

bool));

MOCK_METHOD0(OnSyncCycleCompleted, void());

MOCK_METHOD1(OnConnectionStatusChange,

@@ -207,7 +208,7 @@ class SyncBackendHostTest : public testing::Test {

// Synchronously initializes the backend.

void InitializeBackend(bool expect_success) {

- EXPECT_CALL(mock_frontend_, OnBackendInitialized(_, _, expect_success)).

+ EXPECT_CALL(mock_frontend_, OnBackendInitialized(_, _, _, expect_success)).

WillOnce(InvokeWithoutArgs(QuitMessageLoop));

backend_->Initialize(

&mock_frontend_,