components/sync/api/model_type_service_unittest.cc - Issue 2388973002: [Sync] Removing duplicate includes, part 2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: components/sync/api/model_type_service_unittest.cc

Issue 2388973002: [Sync] Removing duplicate includes, part 2. (Closed)

Patch Set: Update for Max's comments. Created 4 years, 2 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 unified diff | Download patch

« no previous file with comments | « components/sync/api/attachments/attachment_unittest.cc ('k') | components/sync/api/sync_change_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include <memory>	5 #include "components/sync/api/model_type_service.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/memory/ptr_util.h"	8 #include "base/memory/ptr_util.h"

9 #include "components/sync/api/data_type_error_handler_mock.h"	9 #include "components/sync/api/data_type_error_handler_mock.h"

10 #include "components/sync/api/fake_model_type_change_processor.h"	10 #include "components/sync/api/fake_model_type_change_processor.h"

11 #include "components/sync/api/stub_model_type_service.h"	11 #include "components/sync/api/stub_model_type_service.h"

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

13	13

14 namespace syncer {	14 namespace syncer {

15	15

(...skipping 130 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
146 service()->ResolveConflict(local_data, remote_data).type());	146 service()->ResolveConflict(local_data, remote_data).type());

147	147

148 local_data.specifics.clear_preference();	148 local_data.specifics.clear_preference();

149 EXPECT_TRUE(local_data.is_deleted());	149 EXPECT_TRUE(local_data.is_deleted());

150 EXPECT_FALSE(remote_data.is_deleted());	150 EXPECT_FALSE(remote_data.is_deleted());

151 EXPECT_EQ(ConflictResolution::USE_REMOTE,	151 EXPECT_EQ(ConflictResolution::USE_REMOTE,

152 service()->ResolveConflict(local_data, remote_data).type());	152 service()->ResolveConflict(local_data, remote_data).type());

153 }	153 }

154	154

155 } // namespace syncer	155 } // namespace syncer

OLD	NEW