sync/test/engine/injectable_sync_context_proxy.h - Issue 442623002: Revert of sync: Add non-blocking type encryption support

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: sync/test/engine/injectable_sync_context_proxy.h

Issue 442623002: Revert of sync: Add non-blocking type encryption support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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:

Index: sync/test/engine/injectable_sync_context_proxy.h

diff --git a/sync/test/engine/injectable_sync_context_proxy.h b/sync/test/engine/injectable_sync_context_proxy.h

index a6303f1f8280591f1162111655d296a1ef3eb801..7c9f48dc5fedb083ca5a0e6a4f454a7cd981a6d2 100644

--- a/sync/test/engine/injectable_sync_context_proxy.h

+++ b/sync/test/engine/injectable_sync_context_proxy.h

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

#define SYNC_TEST_ENGINE_INJECTABLE_SYNC_CONTEXT_PROXY_H_

#include "sync/internal_api/public/base/model_type.h"

-#include "sync/internal_api/public/non_blocking_sync_common.h"

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

namespace syncer {

@@ -25,7 +24,6 @@

virtual void ConnectTypeToSync(

syncer::ModelType type,

const DataTypeState& data_type_state,

- const UpdateResponseDataList& pending_updates,

const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& type_sync_proxy)

OVERRIDE;

virtual void Disconnect(syncer::ModelType type) OVERRIDE;