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 <map> | 5 #include <map> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/files/scoped_temp_dir.h" |
12 #include "base/location.h" | 13 #include "base/location.h" |
13 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
14 #include "base/message_loop.h" | 15 #include "base/message_loop.h" |
15 #include "base/scoped_temp_dir.h" | |
16 #include "base/stl_util.h" | 16 #include "base/stl_util.h" |
17 #include "base/time.h" | 17 #include "base/time.h" |
18 #include "chrome/browser/sessions/session_types_test_helper.h" | 18 #include "chrome/browser/sessions/session_types_test_helper.h" |
19 #include "chrome/browser/signin/signin_manager.h" | 19 #include "chrome/browser/signin/signin_manager.h" |
20 #include "chrome/browser/signin/signin_manager_factory.h" | 20 #include "chrome/browser/signin/signin_manager_factory.h" |
21 #include "chrome/browser/signin/token_service_factory.h" | 21 #include "chrome/browser/signin/token_service_factory.h" |
22 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" | 22 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" |
23 #include "chrome/browser/sync/glue/session_change_processor.h" | 23 #include "chrome/browser/sync/glue/session_change_processor.h" |
24 #include "chrome/browser/sync/glue/session_data_type_controller.h" | 24 #include "chrome/browser/sync/glue/session_data_type_controller.h" |
25 #include "chrome/browser/sync/glue/session_model_associator.h" | 25 #include "chrome/browser/sync/glue/session_model_associator.h" |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
254 | 254 |
255 TokenServiceFactory::GetForProfile(profile())->IssueAuthTokenForTest( | 255 TokenServiceFactory::GetForProfile(profile())->IssueAuthTokenForTest( |
256 GaiaConstants::kSyncService, "token"); | 256 GaiaConstants::kSyncService, "token"); |
257 sync_service_->Initialize(); | 257 sync_service_->Initialize(); |
258 MessageLoop::current()->Run(); | 258 MessageLoop::current()->Run(); |
259 return true; | 259 return true; |
260 } | 260 } |
261 | 261 |
262 content::TestBrowserThread io_thread_; | 262 content::TestBrowserThread io_thread_; |
263 // Path used in testing. | 263 // Path used in testing. |
264 ScopedTempDir temp_dir_; | 264 base::ScopedTempDir temp_dir_; |
265 SessionModelAssociator* model_associator_; | 265 SessionModelAssociator* model_associator_; |
266 SessionChangeProcessor* change_processor_; | 266 SessionChangeProcessor* change_processor_; |
267 SessionID window_id_; | 267 SessionID window_id_; |
268 scoped_ptr<TestProfileSyncService> sync_service_; | 268 scoped_ptr<TestProfileSyncService> sync_service_; |
269 const gfx::Rect window_bounds_; | 269 const gfx::Rect window_bounds_; |
270 bool notified_of_update_; | 270 bool notified_of_update_; |
271 bool notified_of_refresh_; | 271 bool notified_of_refresh_; |
272 content::NotificationRegistrar registrar_; | 272 content::NotificationRegistrar registrar_; |
273 }; | 273 }; |
274 | 274 |
(...skipping 921 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1196 sync_pb::SessionSpecifics specifics; | 1196 sync_pb::SessionSpecifics specifics; |
1197 header.SetSessionSpecifics(specifics); | 1197 header.SetSessionSpecifics(specifics); |
1198 } | 1198 } |
1199 // Ensure we associate properly despite the pre-existing node with our local | 1199 // Ensure we associate properly despite the pre-existing node with our local |
1200 // tag. | 1200 // tag. |
1201 error = model_associator_->AssociateModels(NULL, NULL); | 1201 error = model_associator_->AssociateModels(NULL, NULL); |
1202 ASSERT_FALSE(error.IsSet()); | 1202 ASSERT_FALSE(error.IsSet()); |
1203 } | 1203 } |
1204 | 1204 |
1205 } // namespace browser_sync | 1205 } // namespace browser_sync |
OLD | NEW |