sync/internal_api/public/test/null_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/internal_api/public/test/null_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/internal_api/public/test/null_sync_context_proxy.h

diff --git a/sync/internal_api/public/test/null_sync_context_proxy.h b/sync/internal_api/public/test/null_sync_context_proxy.h

index 0ca080dd8fff6bac782899a5387af06bd684acf4..808f664f372b27c95785c8a622aeb56c98dcf6c3 100644

--- a/sync/internal_api/public/test/null_sync_context_proxy.h

+++ b/sync/internal_api/public/test/null_sync_context_proxy.h

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

#define SYNC_INTERNAL_API_PUBLIC_TEST_NULL_SYNC_CONTEXT_PROXY_H_

#include "base/memory/weak_ptr.h"

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

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

namespace syncer {

@@ -24,7 +23,6 @@

virtual void ConnectTypeToSync(

syncer::ModelType type,

const DataTypeState& data_type_state,

- const UpdateResponseDataList& saved_pending_updates,

const base::WeakPtr<ModelTypeSyncProxyImpl>& type_sync_proxy) OVERRIDE;

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

virtual scoped_ptr<SyncContextProxy> Clone() const OVERRIDE;