| 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/internal_api/write_transaction.h" |  | 
|   11 #include "chrome/browser/sync/profile_sync_service_mock.h" |   10 #include "chrome/browser/sync/profile_sync_service_mock.h" | 
|   12 #include "chrome/browser/sync/test/engine/test_user_share.h" |  | 
|   13 #include "chrome/common/chrome_notification_types.h" |   11 #include "chrome/common/chrome_notification_types.h" | 
 |   12 #include "sync/internal_api/test_user_share.h" | 
 |   13 #include "sync/internal_api/write_transaction.h" | 
|   14 #include "sync/protocol/sync.pb.h" |   14 #include "sync/protocol/sync.pb.h" | 
|   15 #include "sync/sessions/session_state.h" |   15 #include "sync/sessions/session_state.h" | 
|   16 #include "sync/syncable/model_type_test_util.h" |   16 #include "sync/syncable/model_type_test_util.h" | 
|   17 #include "testing/gmock/include/gmock/gmock.h" |   17 #include "testing/gmock/include/gmock/gmock.h" | 
|   18 #include "testing/gtest/include/gtest/gtest.h" |   18 #include "testing/gtest/include/gtest/gtest.h" | 
|   19  |   19  | 
|   20 using ::testing::_; |   20 using ::testing::_; | 
|   21 using ::testing::Eq; |   21 using ::testing::Eq; | 
|   22 using ::testing::Mock; |   22 using ::testing::Mock; | 
|   23 using ::testing::NiceMock; |   23 using ::testing::NiceMock; | 
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  319       .WillOnce(Return(DataTypeManager::CONFIGURED)); |  319       .WillOnce(Return(DataTypeManager::CONFIGURED)); | 
|  320   EXPECT_CALL(*manager(), Configure(_, sync_api::CONFIGURE_REASON_MIGRATION)) |  320   EXPECT_CALL(*manager(), Configure(_, sync_api::CONFIGURE_REASON_MIGRATION)) | 
|  321               .Times(1); |  321               .Times(1); | 
|  322   migrator()->MigrateTypes(to_migrate); |  322   migrator()->MigrateTypes(to_migrate); | 
|  323   SetUnsyncedTypes(syncable::ModelTypeSet()); |  323   SetUnsyncedTypes(syncable::ModelTypeSet()); | 
|  324   SendConfigureDone(DataTypeManager::ABORTED, syncable::ModelTypeSet()); |  324   SendConfigureDone(DataTypeManager::ABORTED, syncable::ModelTypeSet()); | 
|  325   EXPECT_EQ(BackendMigrator::IDLE, migrator()->state()); |  325   EXPECT_EQ(BackendMigrator::IDLE, migrator()->state()); | 
|  326 } |  326 } | 
|  327  |  327  | 
|  328 };  // namespace browser_sync |  328 };  // namespace browser_sync | 
| OLD | NEW |