chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.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/supervised_user/legacy/supervised_user_sync_service_unittest.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/supervised_user/legacy/supervised_user_sync_service.cc ('k') | chrome/browser/supervised_user/supervised_user_settings_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc

diff --git a/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc

index 2f04ad248a4474b79d5f5bc78f60bf3dbec17876..079eaa2d09bc64a5d3e568d31cf81c3f1434f192 100644

--- a/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc

+++ b/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc

@@ -16,12 +16,12 @@

#include "chrome/common/pref_names.h"

#include "chrome/test/base/testing_profile.h"

#include "components/prefs/scoped_user_pref_update.h"

+#include "components/sync/api/attachments/attachment_id.h"

+#include "components/sync/api/sync_change.h"

+#include "components/sync/api/sync_error_factory_mock.h"

+#include "components/sync/core/attachments/attachment_service_proxy_for_test.h"

+#include "components/sync/protocol/sync.pb.h"

#include "content/public/test/test_browser_thread_bundle.h"

-#include "sync/api/attachments/attachment_id.h"

-#include "sync/api/sync_change.h"

-#include "sync/api/sync_error_factory_mock.h"

-#include "sync/internal_api/public/attachments/attachment_service_proxy_for_test.h"

-#include "sync/protocol/sync.pb.h"

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

#if defined(OS_CHROMEOS)