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/files/scoped_temp_dir.h" |
13 #include "base/guid.h" | 13 #include "base/guid.h" |
14 #include "base/location.h" | 14 #include "base/location.h" |
15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
16 #include "base/run_loop.h" | 16 #include "base/run_loop.h" |
17 #include "base/stl_util.h" | 17 #include "base/stl_util.h" |
18 #include "base/time/time.h" | 18 #include "base/time/time.h" |
19 #include "chrome/browser/chrome_notification_types.h" | 19 #include "chrome/browser/chrome_notification_types.h" |
20 #include "chrome/browser/invalidation/invalidation_service_factory.h" | 20 #include "chrome/browser/invalidation/invalidation_service_factory.h" |
21 #include "chrome/browser/sessions/session_tab_helper.h" | 21 #include "chrome/browser/sessions/session_tab_helper.h" |
22 #include "chrome/browser/signin/signin_manager.h" | 22 #include "chrome/browser/signin/signin_manager.h" |
23 #include "chrome/browser/signin/signin_manager_factory.h" | 23 #include "chrome/browser/signin/signin_manager_factory.h" |
24 #include "chrome/browser/signin/token_service_factory.h" | |
25 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" | 24 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" |
26 #include "chrome/browser/sync/fake_oauth2_token_service.h" | 25 #include "chrome/browser/sync/fake_oauth2_token_service.h" |
27 #include "chrome/browser/sync/glue/device_info.h" | 26 #include "chrome/browser/sync/glue/device_info.h" |
28 #include "chrome/browser/sync/glue/session_change_processor.h" | 27 #include "chrome/browser/sync/glue/session_change_processor.h" |
29 #include "chrome/browser/sync/glue/session_data_type_controller.h" | 28 #include "chrome/browser/sync/glue/session_data_type_controller.h" |
30 #include "chrome/browser/sync/glue/session_model_associator.h" | 29 #include "chrome/browser/sync/glue/session_model_associator.h" |
31 #include "chrome/browser/sync/glue/session_sync_test_helper.h" | 30 #include "chrome/browser/sync/glue/session_sync_test_helper.h" |
32 #include "chrome/browser/sync/glue/sync_backend_host.h" | 31 #include "chrome/browser/sync/glue/sync_backend_host.h" |
33 #include "chrome/browser/sync/glue/synced_device_tracker.h" | 32 #include "chrome/browser/sync/glue/synced_device_tracker.h" |
34 #include "chrome/browser/sync/glue/synced_tab_delegate.h" | 33 #include "chrome/browser/sync/glue/synced_tab_delegate.h" |
(...skipping 1245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1280 tab_node.SetSessionSpecifics(specifics); | 1279 tab_node.SetSessionSpecifics(specifics); |
1281 } | 1280 } |
1282 | 1281 |
1283 error = model_associator_->DisassociateModels(); | 1282 error = model_associator_->DisassociateModels(); |
1284 ASSERT_FALSE(error.IsSet()); | 1283 ASSERT_FALSE(error.IsSet()); |
1285 error = model_associator_->AssociateModels(NULL, NULL); | 1284 error = model_associator_->AssociateModels(NULL, NULL); |
1286 ASSERT_FALSE(error.IsSet()); | 1285 ASSERT_FALSE(error.IsSet()); |
1287 } | 1286 } |
1288 | 1287 |
1289 } // namespace browser_sync | 1288 } // namespace browser_sync |
OLD | NEW |