| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "sync/internal_api/sync_encryption_handler_impl.h" | 5 #include "sync/internal_api/sync_encryption_handler_impl.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/base64.h" | 9 #include "base/base64.h" |
| 10 #include "base/json/json_string_value_serializer.h" | 10 #include "base/json/json_string_value_serializer.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/message_loop.h" | 12 #include "base/message_loop.h" |
| 13 #include "base/tracked_objects.h" | 13 #include "base/tracked_objects.h" |
| 14 #include "sync/internal_api/public/base/model_type_test_util.h" | 14 #include "sync/internal_api/public/base/model_type_test_util.h" |
| 15 #include "sync/internal_api/public/read_node.h" | 15 #include "sync/internal_api/public/read_node.h" |
| 16 #include "sync/internal_api/public/read_transaction.h" | 16 #include "sync/internal_api/public/read_transaction.h" |
| 17 #include "sync/internal_api/public/write_node.h" | 17 #include "sync/internal_api/public/write_node.h" |
| 18 #include "sync/internal_api/public/write_transaction.h" | 18 #include "sync/internal_api/public/write_transaction.h" |
| 19 #include "sync/internal_api/public/test/test_user_share.h" | 19 #include "sync/internal_api/public/test/test_user_share.h" |
| 20 #include "sync/protocol/nigori_specifics.pb.h" | 20 #include "sync/protocol/nigori_specifics.pb.h" |
| 21 #include "sync/protocol/sync.pb.h" | 21 #include "sync/protocol/sync.pb.h" |
| 22 #include "sync/syncable/entry.h" | 22 #include "sync/syncable/entry.h" |
| 23 #include "sync/syncable/mutable_entry.h" | 23 #include "sync/syncable/mutable_entry.h" |
| 24 #include "sync/syncable/write_transaction.h" | 24 #include "sync/syncable/syncable_write_transaction.h" |
| 25 #include "sync/test/engine/test_id_factory.h" | 25 #include "sync/test/engine/test_id_factory.h" |
| 26 #include "sync/test/fake_encryptor.h" | 26 #include "sync/test/fake_encryptor.h" |
| 27 #include "sync/util/cryptographer.h" | 27 #include "sync/util/cryptographer.h" |
| 28 #include "testing/gmock/include/gmock/gmock.h" | 28 #include "testing/gmock/include/gmock/gmock.h" |
| 29 #include "testing/gtest/include/gtest/gtest.h" | 29 #include "testing/gtest/include/gtest/gtest.h" |
| 30 | 30 |
| 31 namespace syncer { | 31 namespace syncer { |
| 32 | 32 |
| 33 namespace { | 33 namespace { |
| 34 | 34 |
| (...skipping 2208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2243 encryption_handler()->SetKeystoreKeys(keys, | 2243 encryption_handler()->SetKeystoreKeys(keys, |
| 2244 trans.GetWrappedTrans()); | 2244 trans.GetWrappedTrans()); |
| 2245 } | 2245 } |
| 2246 PumpLoop(); | 2246 PumpLoop(); |
| 2247 Mock::VerifyAndClearExpectations(observer()); | 2247 Mock::VerifyAndClearExpectations(observer()); |
| 2248 | 2248 |
| 2249 VerifyMigratedNigoriWithTimestamp(1, CUSTOM_PASSPHRASE, kCustomPass); | 2249 VerifyMigratedNigoriWithTimestamp(1, CUSTOM_PASSPHRASE, kCustomPass); |
| 2250 } | 2250 } |
| 2251 | 2251 |
| 2252 } // namespace syncer | 2252 } // namespace syncer |
| OLD | NEW |