| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/callback.h" | 6 #include "base/callback.h" |
| 7 #include "base/memory/weak_ptr.h" | 7 #include "base/memory/weak_ptr.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
| 10 #include "chrome/browser/sync/glue/local_device_info_provider_mock.h" | 10 #include "chrome/browser/sync/glue/local_device_info_provider_mock.h" |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 "Chromium 10k", | 97 "Chromium 10k", |
| 98 "Chrome 10k", | 98 "Chrome 10k", |
| 99 sync_pb::SyncEnums_DeviceType_TYPE_LINUX, | 99 sync_pb::SyncEnums_DeviceType_TYPE_LINUX, |
| 100 "device_id")); | 100 "device_id")); |
| 101 | 101 |
| 102 controller_ = new SessionDataTypeController( | 102 controller_ = new SessionDataTypeController( |
| 103 &profile_sync_factory_, | 103 &profile_sync_factory_, |
| 104 &profile_, | 104 &profile_, |
| 105 synced_window_getter_.get(), | 105 synced_window_getter_.get(), |
| 106 local_device_.get(), | 106 local_device_.get(), |
| 107 DataTypeController::DisableTypeCallback()); | 107 sync_driver::DataTypeController::DisableTypeCallback()); |
| 108 | 108 |
| 109 load_finished_ = false; | 109 load_finished_ = false; |
| 110 last_type_ = syncer::UNSPECIFIED; | 110 last_type_ = syncer::UNSPECIFIED; |
| 111 last_error_ = syncer::SyncError(); | 111 last_error_ = syncer::SyncError(); |
| 112 } | 112 } |
| 113 | 113 |
| 114 virtual void TearDown() OVERRIDE { | 114 virtual void TearDown() OVERRIDE { |
| 115 controller_ = NULL; | 115 controller_ = NULL; |
| 116 local_device_.reset(); | 116 local_device_.reset(); |
| 117 synced_window_getter_.reset(); | 117 synced_window_getter_.reset(); |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 content::TestBrowserThreadBundle thread_bundle_; | 162 content::TestBrowserThreadBundle thread_bundle_; |
| 163 ProfileSyncComponentsFactoryMock profile_sync_factory_; | 163 ProfileSyncComponentsFactoryMock profile_sync_factory_; |
| 164 TestingProfile profile_; | 164 TestingProfile profile_; |
| 165 base::WeakPtrFactory<SessionDataTypeControllerTest> weak_ptr_factory_; | 165 base::WeakPtrFactory<SessionDataTypeControllerTest> weak_ptr_factory_; |
| 166 syncer::ModelType last_type_; | 166 syncer::ModelType last_type_; |
| 167 syncer::SyncError last_error_; | 167 syncer::SyncError last_error_; |
| 168 }; | 168 }; |
| 169 | 169 |
| 170 TEST_F(SessionDataTypeControllerTest, StartModels) { | 170 TEST_F(SessionDataTypeControllerTest, StartModels) { |
| 171 Start(); | 171 Start(); |
| 172 EXPECT_EQ(DataTypeController::MODEL_LOADED, controller_->state()); | 172 EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED, |
| 173 controller_->state()); |
| 173 EXPECT_TRUE(LoadResult()); | 174 EXPECT_TRUE(LoadResult()); |
| 174 } | 175 } |
| 175 | 176 |
| 176 TEST_F(SessionDataTypeControllerTest, StartModelsDelayedByLocalDevice) { | 177 TEST_F(SessionDataTypeControllerTest, StartModelsDelayedByLocalDevice) { |
| 177 local_device_->SetInitialized(false); | 178 local_device_->SetInitialized(false); |
| 178 Start(); | 179 Start(); |
| 179 EXPECT_FALSE(load_finished_); | 180 EXPECT_FALSE(load_finished_); |
| 180 EXPECT_EQ(DataTypeController::MODEL_STARTING, controller_->state()); | 181 EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING, |
| 182 controller_->state()); |
| 181 | 183 |
| 182 local_device_->SetInitialized(true); | 184 local_device_->SetInitialized(true); |
| 183 EXPECT_EQ(DataTypeController::MODEL_LOADED, controller_->state()); | 185 EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED, |
| 186 controller_->state()); |
| 184 EXPECT_TRUE(LoadResult()); | 187 EXPECT_TRUE(LoadResult()); |
| 185 } | 188 } |
| 186 | 189 |
| 187 TEST_F(SessionDataTypeControllerTest, StartModelsDelayedByRestoreInProgress) { | 190 TEST_F(SessionDataTypeControllerTest, StartModelsDelayedByRestoreInProgress) { |
| 188 synced_window_delegate_->SetSessionRestoreInProgress(true); | 191 synced_window_delegate_->SetSessionRestoreInProgress(true); |
| 189 Start(); | 192 Start(); |
| 190 EXPECT_FALSE(load_finished_); | 193 EXPECT_FALSE(load_finished_); |
| 191 EXPECT_EQ(DataTypeController::MODEL_STARTING, controller_->state()); | 194 EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING, |
| 195 controller_->state()); |
| 192 | 196 |
| 193 synced_window_delegate_->SetSessionRestoreInProgress(false); | 197 synced_window_delegate_->SetSessionRestoreInProgress(false); |
| 194 EXPECT_EQ(DataTypeController::MODEL_LOADED, controller_->state()); | 198 EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED, |
| 199 controller_->state()); |
| 195 EXPECT_TRUE(LoadResult()); | 200 EXPECT_TRUE(LoadResult()); |
| 196 } | 201 } |
| 197 | 202 |
| 198 TEST_F(SessionDataTypeControllerTest, | 203 TEST_F(SessionDataTypeControllerTest, |
| 199 StartModelsDelayedByLocalDeviceThenRestoreInProgress) { | 204 StartModelsDelayedByLocalDeviceThenRestoreInProgress) { |
| 200 local_device_->SetInitialized(false); | 205 local_device_->SetInitialized(false); |
| 201 synced_window_delegate_->SetSessionRestoreInProgress(true); | 206 synced_window_delegate_->SetSessionRestoreInProgress(true); |
| 202 Start(); | 207 Start(); |
| 203 EXPECT_FALSE(load_finished_); | 208 EXPECT_FALSE(load_finished_); |
| 204 EXPECT_EQ(DataTypeController::MODEL_STARTING, controller_->state()); | 209 EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING, |
| 210 controller_->state()); |
| 205 | 211 |
| 206 local_device_->SetInitialized(true); | 212 local_device_->SetInitialized(true); |
| 207 EXPECT_FALSE(load_finished_); | 213 EXPECT_FALSE(load_finished_); |
| 208 EXPECT_EQ(DataTypeController::MODEL_STARTING, controller_->state()); | 214 EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING, |
| 215 controller_->state()); |
| 209 | 216 |
| 210 synced_window_delegate_->SetSessionRestoreInProgress(false); | 217 synced_window_delegate_->SetSessionRestoreInProgress(false); |
| 211 EXPECT_EQ(DataTypeController::MODEL_LOADED, controller_->state()); | 218 EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED, |
| 219 controller_->state()); |
| 212 EXPECT_TRUE(LoadResult()); | 220 EXPECT_TRUE(LoadResult()); |
| 213 } | 221 } |
| 214 | 222 |
| 215 TEST_F(SessionDataTypeControllerTest, | 223 TEST_F(SessionDataTypeControllerTest, |
| 216 StartModelsDelayedByRestoreInProgressThenLocalDevice) { | 224 StartModelsDelayedByRestoreInProgressThenLocalDevice) { |
| 217 local_device_->SetInitialized(false); | 225 local_device_->SetInitialized(false); |
| 218 synced_window_delegate_->SetSessionRestoreInProgress(true); | 226 synced_window_delegate_->SetSessionRestoreInProgress(true); |
| 219 Start(); | 227 Start(); |
| 220 EXPECT_FALSE(load_finished_); | 228 EXPECT_FALSE(load_finished_); |
| 221 EXPECT_EQ(DataTypeController::MODEL_STARTING, controller_->state()); | 229 EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING, |
| 230 controller_->state()); |
| 222 | 231 |
| 223 synced_window_delegate_->SetSessionRestoreInProgress(false); | 232 synced_window_delegate_->SetSessionRestoreInProgress(false); |
| 224 EXPECT_FALSE(load_finished_); | 233 EXPECT_FALSE(load_finished_); |
| 225 EXPECT_EQ(DataTypeController::MODEL_STARTING, controller_->state()); | 234 EXPECT_EQ(sync_driver::DataTypeController::MODEL_STARTING, |
| 235 controller_->state()); |
| 226 | 236 |
| 227 local_device_->SetInitialized(true); | 237 local_device_->SetInitialized(true); |
| 228 EXPECT_EQ(DataTypeController::MODEL_LOADED, controller_->state()); | 238 EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED, |
| 239 controller_->state()); |
| 229 EXPECT_TRUE(LoadResult()); | 240 EXPECT_TRUE(LoadResult()); |
| 230 } | 241 } |
| 231 | 242 |
| 232 } // namespace | 243 } // namespace |
| 233 | 244 |
| 234 } // namespace browser_sync | 245 } // namespace browser_sync |
| OLD | NEW |