| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/compiler_specific.h" | 5 #include "base/compiler_specific.h" |
| 6 #include "base/macros.h" | 6 #include "base/macros.h" |
| 7 #include "base/memory/scoped_vector.h" | 7 #include "base/memory/scoped_vector.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
| 10 #include "chrome/browser/sync/test/integration/migration_waiter.h" | 10 #include "chrome/browser/sync/test/integration/migration_waiter.h" |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 ASSERT_TRUE(SetupSync()); | 233 ASSERT_TRUE(SetupSync()); |
| 234 RunMigrationTest(migration_list, trigger_method); | 234 RunMigrationTest(migration_list, trigger_method); |
| 235 } | 235 } |
| 236 | 236 |
| 237 private: | 237 private: |
| 238 DISALLOW_COPY_AND_ASSIGN(MigrationSingleClientTest); | 238 DISALLOW_COPY_AND_ASSIGN(MigrationSingleClientTest); |
| 239 }; | 239 }; |
| 240 | 240 |
| 241 // The simplest possible migration tests -- a single data type. | 241 // The simplest possible migration tests -- a single data type. |
| 242 | 242 |
| 243 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsOnlyModifyPref) { | 243 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, |
| 244 DISABLED_PrefsOnlyModifyPref) { |
| 244 RunSingleClientMigrationTest(MakeList(syncer::PREFERENCES), MODIFY_PREF); | 245 RunSingleClientMigrationTest(MakeList(syncer::PREFERENCES), MODIFY_PREF); |
| 245 } | 246 } |
| 246 | 247 |
| 247 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsOnlyModifyBookmark) { | 248 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, |
| 249 DISABLED_PrefsOnlyModifyBookmark) { |
| 248 RunSingleClientMigrationTest(MakeList(syncer::PREFERENCES), | 250 RunSingleClientMigrationTest(MakeList(syncer::PREFERENCES), |
| 249 MODIFY_BOOKMARK); | 251 MODIFY_BOOKMARK); |
| 250 } | 252 } |
| 251 | 253 |
| 252 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, | 254 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, |
| 253 PrefsOnlyTriggerNotification) { | 255 DISABLED_PrefsOnlyTriggerNotification) { |
| 254 RunSingleClientMigrationTest(MakeList(syncer::PREFERENCES), | 256 RunSingleClientMigrationTest(MakeList(syncer::PREFERENCES), |
| 255 TRIGGER_NOTIFICATION); | 257 TRIGGER_NOTIFICATION); |
| 256 } | 258 } |
| 257 | 259 |
| 258 // Nigori is handled specially, so we test that separately. | 260 // Nigori is handled specially, so we test that separately. |
| 259 | 261 |
| 260 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, NigoriOnly) { | 262 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, DISABLED_NigoriOnly) { |
| 261 RunSingleClientMigrationTest(MakeList(syncer::PREFERENCES), | 263 RunSingleClientMigrationTest(MakeList(syncer::PREFERENCES), |
| 262 TRIGGER_NOTIFICATION); | 264 TRIGGER_NOTIFICATION); |
| 263 } | 265 } |
| 264 | 266 |
| 265 // A little more complicated -- two data types. | 267 // A little more complicated -- two data types. |
| 266 | 268 |
| 267 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, BookmarksPrefsIndividually) { | 269 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, |
| 270 DISABLED_BookmarksPrefsIndividually) { |
| 268 RunSingleClientMigrationTest( | 271 RunSingleClientMigrationTest( |
| 269 MakeList(syncer::BOOKMARKS, syncer::PREFERENCES), | 272 MakeList(syncer::BOOKMARKS, syncer::PREFERENCES), |
| 270 MODIFY_PREF); | 273 MODIFY_PREF); |
| 271 } | 274 } |
| 272 | 275 |
| 273 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, BookmarksPrefsBoth) { | 276 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, DISABLED_BookmarksPrefsBoth) { |
| 274 RunSingleClientMigrationTest( | 277 RunSingleClientMigrationTest( |
| 275 MakeList(MakeSet(syncer::BOOKMARKS, syncer::PREFERENCES)), | 278 MakeList(MakeSet(syncer::BOOKMARKS, syncer::PREFERENCES)), |
| 276 MODIFY_BOOKMARK); | 279 MODIFY_BOOKMARK); |
| 277 } | 280 } |
| 278 | 281 |
| 279 // Two data types with one being nigori. | 282 // Two data types with one being nigori. |
| 280 | 283 |
| 281 // See crbug.com/124480. | 284 // See crbug.com/124480. |
| 282 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, | 285 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, |
| 283 DISABLED_PrefsNigoriIndividiaully) { | 286 DISABLED_PrefsNigoriIndividiaully) { |
| 284 RunSingleClientMigrationTest( | 287 RunSingleClientMigrationTest( |
| 285 MakeList(syncer::PREFERENCES, syncer::NIGORI), | 288 MakeList(syncer::PREFERENCES, syncer::NIGORI), |
| 286 TRIGGER_NOTIFICATION); | 289 TRIGGER_NOTIFICATION); |
| 287 } | 290 } |
| 288 | 291 |
| 289 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsNigoriBoth) { | 292 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, DISABLED_PrefsNigoriBoth) { |
| 290 RunSingleClientMigrationTest( | 293 RunSingleClientMigrationTest( |
| 291 MakeList(MakeSet(syncer::PREFERENCES, syncer::NIGORI)), | 294 MakeList(MakeSet(syncer::PREFERENCES, syncer::NIGORI)), |
| 292 MODIFY_PREF); | 295 MODIFY_PREF); |
| 293 } | 296 } |
| 294 | 297 |
| 295 // The whole shebang -- all data types. | 298 // The whole shebang -- all data types. |
| 296 // http://crbug.com/403778 | 299 // http://crbug.com/403778 |
| 297 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, | 300 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, |
| 298 DISABLED_AllTypesIndividually) { | 301 DISABLED_AllTypesIndividually) { |
| 299 ASSERT_TRUE(SetupClients()); | 302 ASSERT_TRUE(SetupClients()); |
| 300 RunSingleClientMigrationTest(GetPreferredDataTypesList(), MODIFY_BOOKMARK); | 303 RunSingleClientMigrationTest(GetPreferredDataTypesList(), MODIFY_BOOKMARK); |
| 301 } | 304 } |
| 302 | 305 |
| 303 // http://crbug.com/403778 | 306 // http://crbug.com/403778 |
| 304 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, | 307 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, |
| 305 DISABLED_AllTypesIndividuallyTriggerNotification) { | 308 DISABLED_AllTypesIndividuallyTriggerNotification) { |
| 306 ASSERT_TRUE(SetupClients()); | 309 ASSERT_TRUE(SetupClients()); |
| 307 RunSingleClientMigrationTest(GetPreferredDataTypesList(), | 310 RunSingleClientMigrationTest(GetPreferredDataTypesList(), |
| 308 TRIGGER_NOTIFICATION); | 311 TRIGGER_NOTIFICATION); |
| 309 } | 312 } |
| 310 | 313 |
| 311 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, AllTypesAtOnce) { | 314 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, DISABLED_AllTypesAtOnce) { |
| 312 ASSERT_TRUE(SetupClients()); | 315 ASSERT_TRUE(SetupClients()); |
| 313 RunSingleClientMigrationTest(MakeList(GetPreferredDataTypes()), | 316 RunSingleClientMigrationTest(MakeList(GetPreferredDataTypes()), |
| 314 MODIFY_PREF); | 317 MODIFY_PREF); |
| 315 } | 318 } |
| 316 | 319 |
| 317 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, | 320 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, |
| 318 AllTypesAtOnceTriggerNotification) { | 321 DISABLED_AllTypesAtOnceTriggerNotification) { |
| 319 ASSERT_TRUE(SetupClients()); | 322 ASSERT_TRUE(SetupClients()); |
| 320 RunSingleClientMigrationTest(MakeList(GetPreferredDataTypes()), | 323 RunSingleClientMigrationTest(MakeList(GetPreferredDataTypes()), |
| 321 TRIGGER_NOTIFICATION); | 324 TRIGGER_NOTIFICATION); |
| 322 } | 325 } |
| 323 | 326 |
| 324 // All data types plus nigori. | 327 // All data types plus nigori. |
| 325 | 328 |
| 326 // See crbug.com/124480. | 329 // See crbug.com/124480. |
| 327 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, | 330 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, |
| 328 DISABLED_AllTypesWithNigoriIndividually) { | 331 DISABLED_AllTypesWithNigoriIndividually) { |
| 329 ASSERT_TRUE(SetupClients()); | 332 ASSERT_TRUE(SetupClients()); |
| 330 MigrationList migration_list = GetPreferredDataTypesList(); | 333 MigrationList migration_list = GetPreferredDataTypesList(); |
| 331 migration_list.push_front(MakeSet(syncer::NIGORI)); | 334 migration_list.push_front(MakeSet(syncer::NIGORI)); |
| 332 RunSingleClientMigrationTest(migration_list, MODIFY_BOOKMARK); | 335 RunSingleClientMigrationTest(migration_list, MODIFY_BOOKMARK); |
| 333 } | 336 } |
| 334 | 337 |
| 335 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, AllTypesWithNigoriAtOnce) { | 338 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, |
| 339 DISABLED_AllTypesWithNigoriAtOnce) { |
| 336 ASSERT_TRUE(SetupClients()); | 340 ASSERT_TRUE(SetupClients()); |
| 337 syncer::ModelTypeSet all_types = GetPreferredDataTypes(); | 341 syncer::ModelTypeSet all_types = GetPreferredDataTypes(); |
| 338 all_types.Put(syncer::NIGORI); | 342 all_types.Put(syncer::NIGORI); |
| 339 RunSingleClientMigrationTest(MakeList(all_types), MODIFY_PREF); | 343 RunSingleClientMigrationTest(MakeList(all_types), MODIFY_PREF); |
| 340 } | 344 } |
| 341 | 345 |
| 342 class MigrationTwoClientTest : public MigrationTest { | 346 class MigrationTwoClientTest : public MigrationTest { |
| 343 public: | 347 public: |
| 344 MigrationTwoClientTest() : MigrationTest(TWO_CLIENT_LEGACY) {} | 348 MigrationTwoClientTest() : MigrationTest(TWO_CLIENT_LEGACY) {} |
| 345 ~MigrationTwoClientTest() override {} | 349 ~MigrationTwoClientTest() override {} |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 427 // Do not add optional datatypes. | 431 // Do not add optional datatypes. |
| 428 } | 432 } |
| 429 | 433 |
| 430 ~MigrationReconfigureTest() override {} | 434 ~MigrationReconfigureTest() override {} |
| 431 | 435 |
| 432 private: | 436 private: |
| 433 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest); | 437 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest); |
| 434 }; | 438 }; |
| 435 | 439 |
| 436 } // namespace | 440 } // namespace |
| OLD | NEW |