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 #include <map> | 5 #include <map> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
11 #include "base/scoped_temp_dir.h" | 11 #include "base/scoped_temp_dir.h" |
12 #include "base/stl_util.h" | 12 #include "base/stl_util.h" |
13 #include "base/task.h" | 13 #include "base/task.h" |
14 #include "base/time.h" | 14 #include "base/time.h" |
15 #include "chrome/browser/sessions/session_service.h" | 15 #include "chrome/browser/sessions/session_service.h" |
16 #include "chrome/browser/sessions/session_service_factory.h" | 16 #include "chrome/browser/sessions/session_service_factory.h" |
17 #include "chrome/browser/sessions/session_service_test_helper.h" | 17 #include "chrome/browser/sessions/session_service_test_helper.h" |
18 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" | 18 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" |
19 #include "chrome/browser/sync/glue/session_change_processor.h" | 19 #include "chrome/browser/sync/glue/session_change_processor.h" |
20 #include "chrome/browser/sync/glue/session_data_type_controller.h" | 20 #include "chrome/browser/sync/glue/session_data_type_controller.h" |
21 #include "chrome/browser/sync/glue/session_model_associator.h" | 21 #include "chrome/browser/sync/glue/session_model_associator.h" |
22 #include "chrome/browser/sync/glue/sync_backend_host.h" | 22 #include "chrome/browser/sync/glue/sync_backend_host.h" |
23 #include "chrome/browser/sync/internal_api/change_record.h" | 23 #include "chrome/browser/sync/internal_api/change_record.h" |
24 #include "chrome/browser/sync/internal_api/read_node.h" | 24 #include "chrome/browser/sync/internal_api/read_node.h" |
25 #include "chrome/browser/sync/internal_api/read_transaction.h" | 25 #include "chrome/browser/sync/internal_api/read_transaction.h" |
26 #include "chrome/browser/sync/internal_api/write_transaction.h" | 26 #include "chrome/browser/sync/internal_api/write_transaction.h" |
27 #include "chrome/browser/sync/profile_sync_factory_mock.h" | 27 #include "chrome/browser/sync/profile_sync_components_factory_mock.h" |
28 #include "chrome/browser/sync/profile_sync_test_util.h" | 28 #include "chrome/browser/sync/profile_sync_test_util.h" |
29 #include "chrome/browser/sync/protocol/session_specifics.pb.h" | 29 #include "chrome/browser/sync/protocol/session_specifics.pb.h" |
30 #include "chrome/browser/sync/protocol/sync.pb.h" | 30 #include "chrome/browser/sync/protocol/sync.pb.h" |
31 #include "chrome/browser/sync/syncable/directory_manager.h" | 31 #include "chrome/browser/sync/syncable/directory_manager.h" |
32 #include "chrome/browser/sync/syncable/model_type.h" | 32 #include "chrome/browser/sync/syncable/model_type.h" |
33 #include "chrome/browser/sync/syncable/syncable.h" | 33 #include "chrome/browser/sync/syncable/syncable.h" |
34 #include "chrome/browser/sync/test/engine/test_id_factory.h" | 34 #include "chrome/browser/sync/test/engine/test_id_factory.h" |
35 #include "chrome/browser/sync/test_profile_sync_service.h" | 35 #include "chrome/browser/sync/test_profile_sync_service.h" |
36 #include "chrome/common/chrome_notification_types.h" | 36 #include "chrome/common/chrome_notification_types.h" |
37 #include "chrome/common/net/gaia/gaia_constants.h" | 37 #include "chrome/common/net/gaia/gaia_constants.h" |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 SessionServiceFactory::SetForTestProfile(profile(), helper_.service()); | 223 SessionServiceFactory::SetForTestProfile(profile(), helper_.service()); |
224 | 224 |
225 // Register the session data type. | 225 // Register the session data type. |
226 model_associator_ = | 226 model_associator_ = |
227 new SessionModelAssociator(sync_service_.get(), | 227 new SessionModelAssociator(sync_service_.get(), |
228 true /* setup_for_test */); | 228 true /* setup_for_test */); |
229 change_processor_ = new SessionChangeProcessor( | 229 change_processor_ = new SessionChangeProcessor( |
230 sync_service_.get(), model_associator_, | 230 sync_service_.get(), model_associator_, |
231 true /* setup_for_test */); | 231 true /* setup_for_test */); |
232 EXPECT_CALL(factory_, CreateSessionSyncComponents(_, _)). | 232 EXPECT_CALL(factory_, CreateSessionSyncComponents(_, _)). |
233 WillOnce(Return(ProfileSyncFactory::SyncComponents( | 233 WillOnce(Return(ProfileSyncComponentsFactory::SyncComponents( |
234 model_associator_, change_processor_))); | 234 model_associator_, change_processor_))); |
235 EXPECT_CALL(factory_, CreateDataTypeManager(_, _)). | 235 EXPECT_CALL(factory_, CreateDataTypeManager(_, _)). |
236 WillOnce(ReturnNewDataTypeManager()); | 236 WillOnce(ReturnNewDataTypeManager()); |
237 sync_service_->RegisterDataTypeController( | 237 sync_service_->RegisterDataTypeController( |
238 new SessionDataTypeController(&factory_, | 238 new SessionDataTypeController(&factory_, |
239 profile(), | 239 profile(), |
240 sync_service_.get())); | 240 sync_service_.get())); |
241 profile()->GetTokenService()->IssueAuthTokenForTest( | 241 profile()->GetTokenService()->IssueAuthTokenForTest( |
242 GaiaConstants::kSyncService, "token"); | 242 GaiaConstants::kSyncService, "token"); |
243 sync_service_->Initialize(); | 243 sync_service_->Initialize(); |
244 MessageLoop::current()->Run(); | 244 MessageLoop::current()->Run(); |
245 return true; | 245 return true; |
246 } | 246 } |
247 | 247 |
248 content::TestBrowserThread io_thread_; | 248 content::TestBrowserThread io_thread_; |
249 // Path used in testing. | 249 // Path used in testing. |
250 ScopedTempDir temp_dir_; | 250 ScopedTempDir temp_dir_; |
251 SessionServiceTestHelper helper_; | 251 SessionServiceTestHelper helper_; |
252 SessionModelAssociator* model_associator_; | 252 SessionModelAssociator* model_associator_; |
253 SessionChangeProcessor* change_processor_; | 253 SessionChangeProcessor* change_processor_; |
254 SessionID window_id_; | 254 SessionID window_id_; |
255 ProfileSyncFactoryMock factory_; | 255 ProfileSyncComponentsFactoryMock factory_; |
256 scoped_ptr<TestProfileSyncService> sync_service_; | 256 scoped_ptr<TestProfileSyncService> sync_service_; |
257 const gfx::Rect window_bounds_; | 257 const gfx::Rect window_bounds_; |
258 bool notified_of_update_; | 258 bool notified_of_update_; |
259 content::NotificationRegistrar registrar_; | 259 content::NotificationRegistrar registrar_; |
260 }; | 260 }; |
261 | 261 |
262 class CreateRootTask : public Task { | 262 class CreateRootTask : public Task { |
263 public: | 263 public: |
264 explicit CreateRootTask(ProfileSyncServiceSessionTest* test) | 264 explicit CreateRootTask(ProfileSyncServiceSessionTest* test) |
265 : test_(test), success_(false) { | 265 : test_(test), success_(false) { |
(...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
894 // Verify the now non-stale session does not get deleted. | 894 // Verify the now non-stale session does not get deleted. |
895 model_associator_->DeleteStaleSessions(); | 895 model_associator_->DeleteStaleSessions(); |
896 ASSERT_TRUE(model_associator_->GetAllForeignSessions(&foreign_sessions)); | 896 ASSERT_TRUE(model_associator_->GetAllForeignSessions(&foreign_sessions)); |
897 ASSERT_EQ(1U, foreign_sessions.size()); | 897 ASSERT_EQ(1U, foreign_sessions.size()); |
898 std::vector<std::vector<SessionID::id_type> > session_reference; | 898 std::vector<std::vector<SessionID::id_type> > session_reference; |
899 session_reference.push_back(tab_list1); | 899 session_reference.push_back(tab_list1); |
900 VerifySyncedSession(tag, session_reference, *(foreign_sessions[0])); | 900 VerifySyncedSession(tag, session_reference, *(foreign_sessions[0])); |
901 } | 901 } |
902 | 902 |
903 } // namespace browser_sync | 903 } // namespace browser_sync |
OLD | NEW |