| 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 "chrome/browser/sync/backend_migrator.h" | 5 #include "chrome/browser/sync/backend_migrator.h" |
| 6 | 6 |
| 7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
| 8 #include "base/tracked_objects.h" | 8 #include "base/tracked_objects.h" |
| 9 #include "chrome/browser/sync/glue/data_type_manager_mock.h" | 9 #include "chrome/browser/sync/glue/data_type_manager_mock.h" |
| 10 #include "chrome/browser/sync/profile_sync_service_mock.h" | 10 #include "chrome/browser/sync/profile_sync_service_mock.h" |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 void SendConfigureDone(DataTypeManager::ConfigureStatus status, | 76 void SendConfigureDone(DataTypeManager::ConfigureStatus status, |
| 77 syncable::ModelTypeSet requested_types) { | 77 syncable::ModelTypeSet requested_types) { |
| 78 if (status == DataTypeManager::OK) { | 78 if (status == DataTypeManager::OK) { |
| 79 DataTypeManager::ConfigureResult result(status, requested_types); | 79 DataTypeManager::ConfigureResult result(status, requested_types); |
| 80 migrator_->OnConfigureDone(result); | 80 migrator_->OnConfigureDone(result); |
| 81 } else { | 81 } else { |
| 82 std::list<SyncError> errors; | 82 std::list<SyncError> errors; |
| 83 DataTypeManager::ConfigureResult result( | 83 DataTypeManager::ConfigureResult result( |
| 84 status, | 84 status, |
| 85 requested_types, | 85 requested_types, |
| 86 errors); | 86 errors, |
| 87 syncable::ModelTypeSet()); |
| 87 migrator_->OnConfigureDone(result); | 88 migrator_->OnConfigureDone(result); |
| 88 } | 89 } |
| 89 message_loop_.RunAllPending(); | 90 message_loop_.RunAllPending(); |
| 90 } | 91 } |
| 91 | 92 |
| 92 ProfileSyncService* service() { return &service_; } | 93 ProfileSyncService* service() { return &service_; } |
| 93 DataTypeManagerMock* manager() { return &manager_; } | 94 DataTypeManagerMock* manager() { return &manager_; } |
| 94 syncable::ModelTypeSet preferred_types() { return preferred_types_; } | 95 syncable::ModelTypeSet preferred_types() { return preferred_types_; } |
| 95 BackendMigrator* migrator() { return migrator_.get(); } | 96 BackendMigrator* migrator() { return migrator_.get(); } |
| 96 void RemovePreferredType(syncable::ModelType type) { | 97 void RemovePreferredType(syncable::ModelType type) { |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 314 .WillOnce(Return(DataTypeManager::CONFIGURED)); | 315 .WillOnce(Return(DataTypeManager::CONFIGURED)); |
| 315 EXPECT_CALL(*manager(), Configure(_, sync_api::CONFIGURE_REASON_MIGRATION)) | 316 EXPECT_CALL(*manager(), Configure(_, sync_api::CONFIGURE_REASON_MIGRATION)) |
| 316 .Times(1); | 317 .Times(1); |
| 317 migrator()->MigrateTypes(to_migrate); | 318 migrator()->MigrateTypes(to_migrate); |
| 318 SetUnsyncedTypes(syncable::ModelTypeSet()); | 319 SetUnsyncedTypes(syncable::ModelTypeSet()); |
| 319 SendConfigureDone(DataTypeManager::ABORTED, syncable::ModelTypeSet()); | 320 SendConfigureDone(DataTypeManager::ABORTED, syncable::ModelTypeSet()); |
| 320 EXPECT_EQ(BackendMigrator::IDLE, migrator()->state()); | 321 EXPECT_EQ(BackendMigrator::IDLE, migrator()->state()); |
| 321 } | 322 } |
| 322 | 323 |
| 323 }; // namespace browser_sync | 324 }; // namespace browser_sync |
| OLD | NEW |