chrome/browser/sync/engine/apply_updates_command_unittest.cc - Issue 8770032: [Sync] Implement encryption-aware conflict resolution.

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/engine/apply_updates_command_unittest.cc

Issue 8770032: [Sync] Implement encryption-aware conflict resolution. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix test Created 9 years 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: chrome/browser/sync/engine/apply_updates_command_unittest.cc

diff --git a/chrome/browser/sync/engine/apply_updates_command_unittest.cc b/chrome/browser/sync/engine/apply_updates_command_unittest.cc

index bd09da5954dc74f3fc8946271c26e7afb52e2895..19bc480c9f6c4e771dab874833d2d65a1309b34e 100644

--- a/chrome/browser/sync/engine/apply_updates_command_unittest.cc

+++ b/chrome/browser/sync/engine/apply_updates_command_unittest.cc

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

#include "chrome/browser/sync/test/engine/fake_model_worker.h"

#include "chrome/browser/sync/test/engine/syncer_command_test.h"

#include "chrome/browser/sync/test/engine/test_id_factory.h"

+#include "chrome/browser/sync/util/cryptographer.h"

#include "testing/gtest/include/gtest/gtest.h"

namespace browser_sync {

« no previous file with comments | « no previous file | chrome/browser/sync/engine/conflict_resolver.h » ('j') | no next file with comments »