| Index: components/sync/core_impl/js_sync_encryption_handler_observer_unittest.cc
|
| diff --git a/sync/internal_api/js_sync_encryption_handler_observer_unittest.cc b/components/sync/core_impl/js_sync_encryption_handler_observer_unittest.cc
|
| similarity index 74%
|
| rename from sync/internal_api/js_sync_encryption_handler_observer_unittest.cc
|
| rename to components/sync/core_impl/js_sync_encryption_handler_observer_unittest.cc
|
| index d8b18a508c72acea0e8586ac677b4562fe6e3167..646d33f5450ebf7984d18f1637aa5e11c6d704a0 100644
|
| --- a/sync/internal_api/js_sync_encryption_handler_observer_unittest.cc
|
| +++ b/components/sync/core_impl/js_sync_encryption_handler_observer_unittest.cc
|
| @@ -2,19 +2,19 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/internal_api/js_sync_encryption_handler_observer.h"
|
| +#include "components/sync/core_impl/js_sync_encryption_handler_observer.h"
|
|
|
| #include "base/location.h"
|
| #include "base/run_loop.h"
|
| #include "base/values.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/internal_api/public/util/sync_string_conversions.h"
|
| -#include "sync/internal_api/public/util/weak_handle.h"
|
| -#include "sync/js/js_event_details.h"
|
| -#include "sync/js/js_test_util.h"
|
| -#include "sync/test/fake_encryptor.h"
|
| -#include "sync/util/cryptographer.h"
|
| -#include "sync/util/time.h"
|
| +#include "components/sync/base/cryptographer.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/base/sync_string_conversions.h"
|
| +#include "components/sync/base/time.h"
|
| +#include "components/sync/base/weak_handle.h"
|
| +#include "components/sync/js/js_event_details.h"
|
| +#include "components/sync/js/js_test_util.h"
|
| +#include "components/sync/test/fake_encryptor.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace syncer {
|
| @@ -39,17 +39,15 @@ class JsSyncEncryptionHandlerObserverTest : public testing::Test {
|
| StrictMock<MockJsEventHandler> mock_js_event_handler_;
|
| JsSyncEncryptionHandlerObserver js_sync_encryption_handler_observer_;
|
|
|
| - void PumpLoop() {
|
| - base::RunLoop().RunUntilIdle();
|
| - }
|
| + void PumpLoop() { base::RunLoop().RunUntilIdle(); }
|
| };
|
|
|
| TEST_F(JsSyncEncryptionHandlerObserverTest, NoArgNotifiations) {
|
| InSequence dummy;
|
|
|
| - EXPECT_CALL(mock_js_event_handler_,
|
| - HandleJsEvent("onEncryptionComplete",
|
| - HasDetails(JsEventDetails())));
|
| + EXPECT_CALL(
|
| + mock_js_event_handler_,
|
| + HandleJsEvent("onEncryptionComplete", HasDetails(JsEventDetails())));
|
|
|
| js_sync_encryption_handler_observer_.OnEncryptionComplete();
|
| PumpLoop();
|
| @@ -66,30 +64,27 @@ TEST_F(JsSyncEncryptionHandlerObserverTest, OnPassphraseRequired) {
|
| "reason",
|
| PassphraseRequiredReasonToString(REASON_PASSPHRASE_NOT_REQUIRED));
|
| reason_encryption_details.SetString(
|
| - "reason",
|
| - PassphraseRequiredReasonToString(REASON_ENCRYPTION));
|
| + "reason", PassphraseRequiredReasonToString(REASON_ENCRYPTION));
|
| reason_decryption_details.SetString(
|
| - "reason",
|
| - PassphraseRequiredReasonToString(REASON_DECRYPTION));
|
| + "reason", PassphraseRequiredReasonToString(REASON_DECRYPTION));
|
|
|
| EXPECT_CALL(mock_js_event_handler_,
|
| HandleJsEvent("onPassphraseRequired",
|
| - HasDetailsAsDictionary(
|
| - reason_passphrase_not_required_details)));
|
| + HasDetailsAsDictionary(
|
| + reason_passphrase_not_required_details)));
|
| EXPECT_CALL(mock_js_event_handler_,
|
| HandleJsEvent("onPassphraseRequired",
|
| - HasDetailsAsDictionary(reason_encryption_details)));
|
| + HasDetailsAsDictionary(reason_encryption_details)));
|
| EXPECT_CALL(mock_js_event_handler_,
|
| HandleJsEvent("onPassphraseRequired",
|
| - HasDetailsAsDictionary(reason_decryption_details)));
|
| + HasDetailsAsDictionary(reason_decryption_details)));
|
|
|
| js_sync_encryption_handler_observer_.OnPassphraseRequired(
|
| - REASON_PASSPHRASE_NOT_REQUIRED,
|
| - sync_pb::EncryptedData());
|
| - js_sync_encryption_handler_observer_.OnPassphraseRequired(REASON_ENCRYPTION,
|
| - sync_pb::EncryptedData());
|
| - js_sync_encryption_handler_observer_.OnPassphraseRequired(REASON_DECRYPTION,
|
| - sync_pb::EncryptedData());
|
| + REASON_PASSPHRASE_NOT_REQUIRED, sync_pb::EncryptedData());
|
| + js_sync_encryption_handler_observer_.OnPassphraseRequired(
|
| + REASON_ENCRYPTION, sync_pb::EncryptedData());
|
| + js_sync_encryption_handler_observer_.OnPassphraseRequired(
|
| + REASON_DECRYPTION, sync_pb::EncryptedData());
|
| PumpLoop();
|
| }
|
|
|
| @@ -99,9 +94,8 @@ TEST_F(JsSyncEncryptionHandlerObserverTest, OnBootstrapTokenUpdated) {
|
| bootstrap_token_details.SetString("type", "PASSPHRASE_BOOTSTRAP_TOKEN");
|
|
|
| EXPECT_CALL(mock_js_event_handler_,
|
| - HandleJsEvent(
|
| - "onBootstrapTokenUpdated",
|
| - HasDetailsAsDictionary(bootstrap_token_details)));
|
| + HandleJsEvent("onBootstrapTokenUpdated",
|
| + HasDetailsAsDictionary(bootstrap_token_details)));
|
|
|
| js_sync_encryption_handler_observer_.OnBootstrapTokenUpdated(
|
| "sensitive_token", PASSPHRASE_BOOTSTRAP_TOKEN);
|
| @@ -131,7 +125,6 @@ TEST_F(JsSyncEncryptionHandlerObserverTest, OnEncryptedTypesChanged) {
|
| PumpLoop();
|
| }
|
|
|
| -
|
| TEST_F(JsSyncEncryptionHandlerObserverTest, OnCryptographerStateChanged) {
|
| base::DictionaryValue expected_details;
|
| bool expected_ready = false;
|
|
|