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/location.h" | 13 #include "base/location.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "base/message_loop.h" | 15 #include "base/message_loop.h" |
16 #include "base/stl_util.h" | 16 #include "base/stl_util.h" |
| 17 #include "base/strings/utf_string_conversions.h" |
17 #include "base/time.h" | 18 #include "base/time.h" |
18 #include "base/utf_string_conversions.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/device_info.h" | 23 #include "chrome/browser/sync/glue/device_info.h" |
24 #include "chrome/browser/sync/glue/session_change_processor.h" | 24 #include "chrome/browser/sync/glue/session_change_processor.h" |
25 #include "chrome/browser/sync/glue/session_data_type_controller.h" | 25 #include "chrome/browser/sync/glue/session_data_type_controller.h" |
26 #include "chrome/browser/sync/glue/session_model_associator.h" | 26 #include "chrome/browser/sync/glue/session_model_associator.h" |
27 #include "chrome/browser/sync/glue/sync_backend_host.h" | 27 #include "chrome/browser/sync/glue/sync_backend_host.h" |
28 #include "chrome/browser/sync/glue/synced_device_tracker.h" | 28 #include "chrome/browser/sync/glue/synced_device_tracker.h" |
(...skipping 1215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1244 sync_pb::SessionSpecifics specifics; | 1244 sync_pb::SessionSpecifics specifics; |
1245 header.SetSessionSpecifics(specifics); | 1245 header.SetSessionSpecifics(specifics); |
1246 } | 1246 } |
1247 // Ensure we associate properly despite the pre-existing node with our local | 1247 // Ensure we associate properly despite the pre-existing node with our local |
1248 // tag. | 1248 // tag. |
1249 error = model_associator_->AssociateModels(NULL, NULL); | 1249 error = model_associator_->AssociateModels(NULL, NULL); |
1250 ASSERT_FALSE(error.IsSet()); | 1250 ASSERT_FALSE(error.IsSet()); |
1251 } | 1251 } |
1252 | 1252 |
1253 } // namespace browser_sync | 1253 } // namespace browser_sync |
OLD | NEW |