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/js/js_sync_manager_observer.h" | 5 #include "chrome/browser/sync/js/js_sync_manager_observer.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 js_sync_manager_observer_.OnEncryptionComplete(); | 70 js_sync_manager_observer_.OnEncryptionComplete(); |
71 PumpLoop(); | 71 PumpLoop(); |
72 } | 72 } |
73 | 73 |
74 TEST_F(JsSyncManagerObserverTest, OnSyncCycleCompleted) { | 74 TEST_F(JsSyncManagerObserverTest, OnSyncCycleCompleted) { |
75 std::string download_progress_markers[syncable::MODEL_TYPE_COUNT]; | 75 std::string download_progress_markers[syncable::MODEL_TYPE_COUNT]; |
76 sessions::SyncSessionSnapshot snapshot(sessions::SyncerStatus(), | 76 sessions::SyncSessionSnapshot snapshot(sessions::SyncerStatus(), |
77 sessions::ErrorCounters(), | 77 sessions::ErrorCounters(), |
78 100, | 78 100, |
79 false, | 79 false, |
80 syncable::ModelEnumSet(), | 80 syncable::ModelTypeSet(), |
81 download_progress_markers, | 81 download_progress_markers, |
82 false, | 82 false, |
83 true, | 83 true, |
84 100, | 84 100, |
85 8, | 85 8, |
86 5, | 86 5, |
87 false, | 87 false, |
88 sessions::SyncSourceInfo(), | 88 sessions::SyncSourceInfo(), |
89 0, | 89 0, |
90 base::Time::Now()); | 90 base::Time::Now()); |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 js_sync_manager_observer_.OnPassphraseAccepted("sensitive_token"); | 193 js_sync_manager_observer_.OnPassphraseAccepted("sensitive_token"); |
194 PumpLoop(); | 194 PumpLoop(); |
195 } | 195 } |
196 | 196 |
197 TEST_F(JsSyncManagerObserverTest, OnEncryptedTypesChanged) { | 197 TEST_F(JsSyncManagerObserverTest, OnEncryptedTypesChanged) { |
198 DictionaryValue expected_details; | 198 DictionaryValue expected_details; |
199 ListValue* encrypted_type_values = new ListValue(); | 199 ListValue* encrypted_type_values = new ListValue(); |
200 const bool encrypt_everything = false; | 200 const bool encrypt_everything = false; |
201 expected_details.Set("encryptedTypes", encrypted_type_values); | 201 expected_details.Set("encryptedTypes", encrypted_type_values); |
202 expected_details.SetBoolean("encryptEverything", encrypt_everything); | 202 expected_details.SetBoolean("encryptEverything", encrypt_everything); |
203 syncable::ModelEnumSet encrypted_types; | 203 syncable::ModelTypeSet encrypted_types; |
204 | 204 |
205 for (int i = syncable::FIRST_REAL_MODEL_TYPE; | 205 for (int i = syncable::FIRST_REAL_MODEL_TYPE; |
206 i < syncable::MODEL_TYPE_COUNT; ++i) { | 206 i < syncable::MODEL_TYPE_COUNT; ++i) { |
207 syncable::ModelType type = syncable::ModelTypeFromInt(i); | 207 syncable::ModelType type = syncable::ModelTypeFromInt(i); |
208 encrypted_types.Put(type); | 208 encrypted_types.Put(type); |
209 encrypted_type_values->Append(Value::CreateStringValue( | 209 encrypted_type_values->Append(Value::CreateStringValue( |
210 syncable::ModelTypeToString(type))); | 210 syncable::ModelTypeToString(type))); |
211 } | 211 } |
212 | 212 |
213 EXPECT_CALL(mock_js_event_handler_, | 213 EXPECT_CALL(mock_js_event_handler_, |
214 HandleJsEvent("onEncryptedTypesChanged", | 214 HandleJsEvent("onEncryptedTypesChanged", |
215 HasDetailsAsDictionary(expected_details))); | 215 HasDetailsAsDictionary(expected_details))); |
216 | 216 |
217 js_sync_manager_observer_.OnEncryptedTypesChanged( | 217 js_sync_manager_observer_.OnEncryptedTypesChanged( |
218 encrypted_types, encrypt_everything); | 218 encrypted_types, encrypt_everything); |
219 PumpLoop(); | 219 PumpLoop(); |
220 } | 220 } |
221 | 221 |
222 } // namespace | 222 } // namespace |
223 } // namespace browser_sync | 223 } // namespace browser_sync |
OLD | NEW |