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 <cstddef> | 5 #include <cstddef> |
6 #include <cstdio> | 6 #include <cstdio> |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/at_exit.h" | 9 #include "base/at_exit.h" |
10 #include "base/base64.h" | 10 #include "base/base64.h" |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
360 blocking_task_runner, | 360 blocking_task_runner, |
361 post_factory.Pass(), | 361 post_factory.Pass(), |
362 routing_info, | 362 routing_info, |
363 workers, | 363 workers, |
364 extensions_activity_monitor, | 364 extensions_activity_monitor, |
365 &change_delegate, | 365 &change_delegate, |
366 credentials, | 366 credentials, |
367 scoped_ptr<syncer::SyncNotifier>( | 367 scoped_ptr<syncer::SyncNotifier>( |
368 sync_notifier_factory.CreateSyncNotifier()), | 368 sync_notifier_factory.CreateSyncNotifier()), |
369 kRestoredKeyForBootstrapping, | 369 kRestoredKeyForBootstrapping, |
| 370 true, // enable keystore encryption |
370 kTestingMode, | 371 kTestingMode, |
371 &null_encryptor, | 372 &null_encryptor, |
372 &unrecoverable_error_handler, | 373 &unrecoverable_error_handler, |
373 &LogUnrecoverableErrorContext); | 374 &LogUnrecoverableErrorContext); |
374 // TODO(akalin): We have pass in model parameters multiple times. | 375 // TODO(akalin): We have pass in model parameters multiple times. |
375 // Organize handling of model types. | 376 // Organize handling of model types. |
376 sync_manager->UpdateEnabledTypes(model_types); | 377 sync_manager->UpdateEnabledTypes(model_types); |
377 sync_manager->StartSyncingNormally(routing_info); | 378 sync_manager->StartSyncingNormally(routing_info); |
378 | 379 |
379 sync_loop.Run(); | 380 sync_loop.Run(); |
380 | 381 |
381 io_thread.Stop(); | 382 io_thread.Stop(); |
382 return 0; | 383 return 0; |
383 } | 384 } |
OLD | NEW |