| OLD | NEW |
| 1 // Copyright 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 "components/sync/core_impl/sync_encryption_handler_impl.h" | 5 #include "components/sync/engine_impl/sync_encryption_handler_impl.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| 11 #include "base/base64.h" | 11 #include "base/base64.h" |
| 12 #include "base/json/json_string_value_serializer.h" | 12 #include "base/json/json_string_value_serializer.h" |
| 13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
| 14 #include "base/tracked_objects.h" | 14 #include "base/tracked_objects.h" |
| 15 #include "components/sync/base/fake_encryptor.h" | 15 #include "components/sync/base/fake_encryptor.h" |
| (...skipping 2280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2296 EXPECT_CALL(*observer(), | 2296 EXPECT_CALL(*observer(), |
| 2297 OnBootstrapTokenUpdated(_, KEYSTORE_BOOTSTRAP_TOKEN)); | 2297 OnBootstrapTokenUpdated(_, KEYSTORE_BOOTSTRAP_TOKEN)); |
| 2298 { | 2298 { |
| 2299 ReadTransaction trans(FROM_HERE, user_share()); | 2299 ReadTransaction trans(FROM_HERE, user_share()); |
| 2300 encryption_handler()->SetKeystoreKeys( | 2300 encryption_handler()->SetKeystoreKeys( |
| 2301 BuildEncryptionKeyProto(kRawKeystoreKey), trans.GetWrappedTrans()); | 2301 BuildEncryptionKeyProto(kRawKeystoreKey), trans.GetWrappedTrans()); |
| 2302 } | 2302 } |
| 2303 } | 2303 } |
| 2304 | 2304 |
| 2305 } // namespace syncer | 2305 } // namespace syncer |
| OLD | NEW |