| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 // TODO(akalin): Rename this file to migration_test.cc. | 5 // TODO(akalin): Rename this file to migration_test.cc. |
| 6 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 8 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/sync/profile_sync_service_harness.h" | 10 #include "chrome/browser/sync/profile_sync_service_harness.h" |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 MODIFY_PREF); | 254 MODIFY_PREF); |
| 255 } | 255 } |
| 256 | 256 |
| 257 // The whole shebang -- all data types. | 257 // The whole shebang -- all data types. |
| 258 | 258 |
| 259 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, AllTypesIndividually) { | 259 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, AllTypesIndividually) { |
| 260 ASSERT_TRUE(SetupClients()); | 260 ASSERT_TRUE(SetupClients()); |
| 261 RunSingleClientMigrationTest(GetPreferredDataTypesList(), MODIFY_BOOKMARK); | 261 RunSingleClientMigrationTest(GetPreferredDataTypesList(), MODIFY_BOOKMARK); |
| 262 } | 262 } |
| 263 | 263 |
| 264 // This test is crashing on Win and Linux sync bots. http://crbug.com/107743 |
| 264 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, | 265 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, |
| 265 AllTypesIndividuallyTriggerNotification) { | 266 DISABLED_AllTypesIndividuallyTriggerNotification) { |
| 266 ASSERT_TRUE(SetupClients()); | 267 ASSERT_TRUE(SetupClients()); |
| 267 RunSingleClientMigrationTest(GetPreferredDataTypesList(), | 268 RunSingleClientMigrationTest(GetPreferredDataTypesList(), |
| 268 TRIGGER_NOTIFICATION); | 269 TRIGGER_NOTIFICATION); |
| 269 } | 270 } |
| 270 | 271 |
| 271 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, AllTypesAtOnce) { | 272 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, AllTypesAtOnce) { |
| 272 ASSERT_TRUE(SetupClients()); | 273 ASSERT_TRUE(SetupClients()); |
| 273 RunSingleClientMigrationTest(MakeList(GetPreferredDataTypes()), | 274 RunSingleClientMigrationTest(MakeList(GetPreferredDataTypes()), |
| 274 MODIFY_PREF); | 275 MODIFY_PREF); |
| 275 } | 276 } |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 447 | 448 |
| 448 // Phase 5: Verify that preferences can still be synchronized. | 449 // Phase 5: Verify that preferences can still be synchronized. |
| 449 VerifyPrefSync(); | 450 VerifyPrefSync(); |
| 450 | 451 |
| 451 // Phase 6: Verify that sessions are registered and enabled. | 452 // Phase 6: Verify that sessions are registered and enabled. |
| 452 ASSERT_TRUE(GetClient(0)->IsTypeRunning(syncable::SESSIONS)); | 453 ASSERT_TRUE(GetClient(0)->IsTypeRunning(syncable::SESSIONS)); |
| 453 ASSERT_TRUE(GetClient(0)->IsTypePreferred(syncable::SESSIONS)); | 454 ASSERT_TRUE(GetClient(0)->IsTypePreferred(syncable::SESSIONS)); |
| 454 } | 455 } |
| 455 | 456 |
| 456 } // namespace | 457 } // namespace |
| OLD | NEW |