chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc - Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT]

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/test/integration/two_client_dictionary_sync_test.cc

Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sc-1

Patch Set: Rebase. Created 4 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

« build/all.gyp ('K') | « chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc

diff --git a/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc b/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc

index e00030ea65da423707d8f687931320a21bdf4565..a7171e057a77282751da804bbef1d78576a86691 100644

--- a/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc

+++ b/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc

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

#include "chrome/browser/sync/test/integration/sync_integration_test_util.h"

#include "chrome/browser/sync/test/integration/sync_test.h"

#include "chrome/common/spellcheck_common.h"

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

+#include "components/sync/base/model_type.h"

using chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS;

using dictionary_helper::AwaitNumDictionaryEntries;