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 "chrome/browser/sync/engine/syncapi.h" | 5 #include "chrome/browser/sync/engine/syncapi.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <bitset> | 8 #include <bitset> |
9 #include <iomanip> | 9 #include <iomanip> |
10 #include <list> | 10 #include <list> |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h" | 54 #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h" |
55 #include "chrome/browser/sync/sessions/sync_session.h" | 55 #include "chrome/browser/sync/sessions/sync_session.h" |
56 #include "chrome/browser/sync/sessions/sync_session_context.h" | 56 #include "chrome/browser/sync/sessions/sync_session_context.h" |
57 #include "chrome/browser/sync/syncable/autofill_migration.h" | 57 #include "chrome/browser/sync/syncable/autofill_migration.h" |
58 #include "chrome/browser/sync/syncable/directory_change_listener.h" | 58 #include "chrome/browser/sync/syncable/directory_change_listener.h" |
59 #include "chrome/browser/sync/syncable/directory_manager.h" | 59 #include "chrome/browser/sync/syncable/directory_manager.h" |
60 #include "chrome/browser/sync/syncable/model_type_payload_map.h" | 60 #include "chrome/browser/sync/syncable/model_type_payload_map.h" |
61 #include "chrome/browser/sync/syncable/model_type.h" | 61 #include "chrome/browser/sync/syncable/model_type.h" |
62 #include "chrome/browser/sync/syncable/nigori_util.h" | 62 #include "chrome/browser/sync/syncable/nigori_util.h" |
63 #include "chrome/browser/sync/syncable/syncable.h" | 63 #include "chrome/browser/sync/syncable/syncable.h" |
64 #include "chrome/browser/sync/util/crypto_helpers.h" | |
65 #include "chrome/common/chrome_switches.h" | 64 #include "chrome/common/chrome_switches.h" |
66 #include "chrome/common/deprecated/event_sys.h" | 65 #include "chrome/common/deprecated/event_sys.h" |
67 #include "chrome/common/net/gaia/gaia_authenticator.h" | 66 #include "chrome/common/net/gaia/gaia_authenticator.h" |
68 #include "content/browser/browser_thread.h" | 67 #include "content/browser/browser_thread.h" |
69 #include "net/base/network_change_notifier.h" | 68 #include "net/base/network_change_notifier.h" |
70 | 69 |
71 using base::TimeDelta; | 70 using base::TimeDelta; |
72 using browser_sync::AllStatus; | 71 using browser_sync::AllStatus; |
73 using browser_sync::Cryptographer; | 72 using browser_sync::Cryptographer; |
74 using browser_sync::KeyParams; | 73 using browser_sync::KeyParams; |
(...skipping 2764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2839 void SyncManager::TriggerOnIncomingNotificationForTest( | 2838 void SyncManager::TriggerOnIncomingNotificationForTest( |
2840 const syncable::ModelTypeBitSet& model_types) { | 2839 const syncable::ModelTypeBitSet& model_types) { |
2841 syncable::ModelTypePayloadMap model_types_with_payloads = | 2840 syncable::ModelTypePayloadMap model_types_with_payloads = |
2842 syncable::ModelTypePayloadMapFromBitSet(model_types, | 2841 syncable::ModelTypePayloadMapFromBitSet(model_types, |
2843 std::string()); | 2842 std::string()); |
2844 | 2843 |
2845 data_->OnIncomingNotification(model_types_with_payloads); | 2844 data_->OnIncomingNotification(model_types_with_payloads); |
2846 } | 2845 } |
2847 | 2846 |
2848 } // namespace sync_api | 2847 } // namespace sync_api |
OLD | NEW |