OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/macros.h" | 5 #include "base/macros.h" |
6 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 6 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
7 #include "chrome/browser/sync/test/integration/sync_test.h" | 7 #include "chrome/browser/sync/test/integration/sync_test.h" |
8 #include "components/browser_sync/profile_sync_service.h" | 8 #include "components/browser_sync/profile_sync_service.h" |
9 #include "components/sync/base/model_type.h" | 9 #include "components/sync/base/model_type.h" |
10 #include "components/sync/base/sync_prefs.h" | 10 #include "components/sync/base/sync_prefs.h" |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
151 ModelTypeSet registered_types_; | 151 ModelTypeSet registered_types_; |
152 ModelTypeSet selectable_types_; | 152 ModelTypeSet selectable_types_; |
153 ModelTypeSet multi_grouped_types_; | 153 ModelTypeSet multi_grouped_types_; |
154 ModelTypeSet registered_directory_types_; | 154 ModelTypeSet registered_directory_types_; |
155 ModelTypeSet registered_selectable_types_; | 155 ModelTypeSet registered_selectable_types_; |
156 | 156 |
157 private: | 157 private: |
158 DISALLOW_COPY_AND_ASSIGN(EnableDisableSingleClientTest); | 158 DISALLOW_COPY_AND_ASSIGN(EnableDisableSingleClientTest); |
159 }; | 159 }; |
160 | 160 |
161 // crbug.com/689662 | 161 IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) { |
skym
2017/03/14 21:39:06
Why are these tests being fixed by this change? Am
Gang Wu
2017/03/15 07:55:45
Before this change, sync client always create ARC
skym
2017/03/15 15:45:58
What I was trying to say is that you're fixing the
Gang Wu
2017/03/16 18:40:30
Done.
| |
162 #if defined(OS_CHROMEOS) | |
163 #define MAYBE_EnableOneAtATime DISABLED_EnableOneAtATime | |
164 #else | |
165 #define MAYBE_EnableOneAtATime EnableOneAtATime | |
166 #endif | |
167 IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, MAYBE_EnableOneAtATime) { | |
168 // Setup sync with no enabled types. | 162 // Setup sync with no enabled types. |
169 SetupTest(false); | 163 SetupTest(false); |
170 | 164 |
171 for (ModelTypeSet::Iterator si = selectable_types_.First(); si.Good(); | 165 for (ModelTypeSet::Iterator si = selectable_types_.First(); si.Good(); |
172 si.Inc()) { | 166 si.Inc()) { |
173 const ModelTypeSet grouped_types = ResolveGroup(si.Get()); | 167 const ModelTypeSet grouped_types = ResolveGroup(si.Get()); |
174 const ModelTypeSet single_grouped_types = WithoutMultiTypes(grouped_types); | 168 const ModelTypeSet single_grouped_types = WithoutMultiTypes(grouped_types); |
175 for (ModelTypeSet::Iterator sgi = single_grouped_types.First(); sgi.Good(); | 169 for (ModelTypeSet::Iterator sgi = single_grouped_types.First(); sgi.Good(); |
176 sgi.Inc()) { | 170 sgi.Inc()) { |
177 VerifyExistence(user_share_, false, sgi.Get(), si.Get()); | 171 VerifyExistence(user_share_, false, sgi.Get(), si.Get()); |
178 } | 172 } |
179 | 173 |
180 EXPECT_TRUE(GetClient(0)->EnableSyncForDatatype(si.Get())); | 174 EXPECT_TRUE(GetClient(0)->EnableSyncForDatatype(si.Get())); |
181 | 175 |
182 for (ModelTypeSet::Iterator gi = grouped_types.First(); gi.Good(); | 176 for (ModelTypeSet::Iterator gi = grouped_types.First(); gi.Good(); |
183 gi.Inc()) { | 177 gi.Inc()) { |
184 VerifyExistence(user_share_, true, gi.Get(), si.Get()); | 178 VerifyExistence(user_share_, true, gi.Get(), si.Get()); |
185 } | 179 } |
186 } | 180 } |
187 } | 181 } |
188 | 182 |
189 // crbug.com/689662 | 183 IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) { |
190 #if defined(OS_CHROMEOS) | |
191 #define MAYBE_DisableOneAtATime DISABLED_DisableOneAtATime | |
192 #else | |
193 #define MAYBE_DisableOneAtATime DisableOneAtATime | |
194 #endif | |
195 IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, MAYBE_DisableOneAtATime) { | |
196 // Setup sync with no disabled types. | 184 // Setup sync with no disabled types. |
197 SetupTest(true); | 185 SetupTest(true); |
198 | 186 |
199 // Make sure all top-level nodes exist first. | 187 // Make sure all top-level nodes exist first. |
200 for (ModelTypeSet::Iterator rdi = registered_directory_types_.First(); | 188 for (ModelTypeSet::Iterator rdi = registered_directory_types_.First(); |
201 rdi.Good(); rdi.Inc()) { | 189 rdi.Good(); rdi.Inc()) { |
202 EXPECT_TRUE(DoesTopLevelNodeExist(user_share_, rdi.Get()) || | 190 EXPECT_TRUE(DoesTopLevelNodeExist(user_share_, rdi.Get()) || |
203 IsUnready(data_type_status_table_, rdi.Get())) | 191 IsUnready(data_type_status_table_, rdi.Get())) |
204 << ModelTypeToString(rdi.Get()); | 192 << ModelTypeToString(rdi.Get()); |
205 } | 193 } |
(...skipping 17 matching lines...) Expand all Loading... | |
223 | 211 |
224 // Lastly make sure that all the multi grouped times are all gone, since we | 212 // Lastly make sure that all the multi grouped times are all gone, since we |
225 // did not check these after disabling inside the above loop. | 213 // did not check these after disabling inside the above loop. |
226 for (ModelTypeSet::Iterator mgi = multi_grouped_types_.First(); mgi.Good(); | 214 for (ModelTypeSet::Iterator mgi = multi_grouped_types_.First(); mgi.Good(); |
227 mgi.Inc()) { | 215 mgi.Inc()) { |
228 VerifyExistence(user_share_, false, mgi.Get()); | 216 VerifyExistence(user_share_, false, mgi.Get()); |
229 } | 217 } |
230 } | 218 } |
231 | 219 |
232 } // namespace | 220 } // namespace |
OLD | NEW |