Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

Side by Side Diff: chrome/browser/sync/js/js_sync_manager_observer_unittest.cc

Issue 8851006: [Sync] Replace all instances of ModelTypeSet with ModelEnumSet (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup pass #2 Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
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::ModelTypeSet encrypted_types; 203 syncable::ModelEnumSet 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.insert(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
OLDNEW
« no previous file with comments | « chrome/browser/sync/js/js_sync_manager_observer.cc ('k') | chrome/browser/sync/profile_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698