| 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/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "base/tracked_objects.h" | 8 #include "base/tracked_objects.h" |
| 9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
| 10 #include "chrome/browser/sync/profile_sync_service_mock.h" | 10 #include "chrome/browser/sync/profile_sync_service_mock.h" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 trans.GetDirectory()->SetDownloadProgress(type, progress_marker); | 72 trans.GetDirectory()->SetDownloadProgress(type, progress_marker); |
| 73 } | 73 } |
| 74 } | 74 } |
| 75 | 75 |
| 76 void SendConfigureDone(DataTypeManager::ConfigureStatus status, | 76 void SendConfigureDone(DataTypeManager::ConfigureStatus status, |
| 77 syncer::ModelTypeSet requested_types) { | 77 syncer::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::map<syncer::ModelType, syncer::SyncError> errors; | |
| 83 DataTypeManager::ConfigureResult result( | 82 DataTypeManager::ConfigureResult result( |
| 84 status, | 83 status, |
| 85 requested_types, | 84 requested_types); |
| 86 errors, | |
| 87 syncer::ModelTypeSet(), | |
| 88 syncer::ModelTypeSet()); | |
| 89 migrator_->OnConfigureDone(result); | 85 migrator_->OnConfigureDone(result); |
| 90 } | 86 } |
| 91 message_loop_.RunUntilIdle(); | 87 message_loop_.RunUntilIdle(); |
| 92 } | 88 } |
| 93 | 89 |
| 94 ProfileSyncService* service() { return &service_; } | 90 ProfileSyncService* service() { return &service_; } |
| 95 DataTypeManagerMock* manager() { return &manager_; } | 91 DataTypeManagerMock* manager() { return &manager_; } |
| 96 syncer::ModelTypeSet preferred_types() { return preferred_types_; } | 92 syncer::ModelTypeSet preferred_types() { return preferred_types_; } |
| 97 BackendMigrator* migrator() { return migrator_.get(); } | 93 BackendMigrator* migrator() { return migrator_.get(); } |
| 98 void RemovePreferredType(syncer::ModelType type) { | 94 void RemovePreferredType(syncer::ModelType type) { |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 EXPECT_CALL( | 331 EXPECT_CALL( |
| 336 *manager(), | 332 *manager(), |
| 337 PurgeForMigration(_, syncer::CONFIGURE_REASON_MIGRATION)).Times(1); | 333 PurgeForMigration(_, syncer::CONFIGURE_REASON_MIGRATION)).Times(1); |
| 338 migrator()->MigrateTypes(to_migrate); | 334 migrator()->MigrateTypes(to_migrate); |
| 339 SetUnsyncedTypes(syncer::ModelTypeSet()); | 335 SetUnsyncedTypes(syncer::ModelTypeSet()); |
| 340 SendConfigureDone(DataTypeManager::ABORTED, syncer::ModelTypeSet()); | 336 SendConfigureDone(DataTypeManager::ABORTED, syncer::ModelTypeSet()); |
| 341 EXPECT_EQ(BackendMigrator::IDLE, migrator()->state()); | 337 EXPECT_EQ(BackendMigrator::IDLE, migrator()->state()); |
| 342 } | 338 } |
| 343 | 339 |
| 344 }; // namespace browser_sync | 340 }; // namespace browser_sync |
| OLD | NEW |