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

Unified Diff: sync/internal_api/js_sync_manager_observer_unittest.cc

Issue 10698014: [Sync] Rename csync namespace to syncer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 6 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/internal_api/js_sync_manager_observer.cc ('k') | sync/internal_api/public/base_node.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/js_sync_manager_observer_unittest.cc
diff --git a/sync/internal_api/js_sync_manager_observer_unittest.cc b/sync/internal_api/js_sync_manager_observer_unittest.cc
index 1693264c42f66b842304818fd0ecbec2d62be7f1..95f4e232b230e9d0b7c27c8239b720231b9da93c 100644
--- a/sync/internal_api/js_sync_manager_observer_unittest.cc
+++ b/sync/internal_api/js_sync_manager_observer_unittest.cc
@@ -16,7 +16,7 @@
#include "sync/protocol/sync_protocol_error.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace csync {
+namespace syncer {
namespace {
using ::testing::InSequence;
@@ -92,9 +92,9 @@ TEST_F(JsSyncManagerObserverTest, OnSyncCycleCompleted) {
}
TEST_F(JsSyncManagerObserverTest, OnActionableError) {
- csync::SyncProtocolError sync_error;
- sync_error.action = csync::CLEAR_USER_DATA_AND_RESYNC;
- sync_error.error_type = csync::TRANSIENT_ERROR;
+ syncer::SyncProtocolError sync_error;
+ sync_error.action = syncer::CLEAR_USER_DATA_AND_RESYNC;
+ sync_error.error_type = syncer::TRANSIENT_ERROR;
DictionaryValue expected_details;
expected_details.Set("syncError", sync_error.ToValue());
@@ -108,11 +108,11 @@ TEST_F(JsSyncManagerObserverTest, OnActionableError) {
TEST_F(JsSyncManagerObserverTest, OnConnectionStatusChange) {
- const csync::ConnectionStatus kStatus =
- csync::CONNECTION_AUTH_ERROR;
+ const syncer::ConnectionStatus kStatus =
+ syncer::CONNECTION_AUTH_ERROR;
DictionaryValue expected_details;
expected_details.SetString("status",
- csync::ConnectionStatusToString(kStatus));
+ syncer::ConnectionStatusToString(kStatus));
EXPECT_CALL(mock_js_event_handler_,
HandleJsEvent("onConnectionStatusChange",
@@ -131,14 +131,14 @@ TEST_F(JsSyncManagerObserverTest, OnPassphraseRequired) {
reason_passphrase_not_required_details.SetString(
"reason",
- csync::PassphraseRequiredReasonToString(
- csync::REASON_PASSPHRASE_NOT_REQUIRED));
+ syncer::PassphraseRequiredReasonToString(
+ syncer::REASON_PASSPHRASE_NOT_REQUIRED));
reason_encryption_details.SetString(
"reason",
- csync::PassphraseRequiredReasonToString(csync::REASON_ENCRYPTION));
+ syncer::PassphraseRequiredReasonToString(syncer::REASON_ENCRYPTION));
reason_decryption_details.SetString(
"reason",
- csync::PassphraseRequiredReasonToString(csync::REASON_DECRYPTION));
+ syncer::PassphraseRequiredReasonToString(syncer::REASON_DECRYPTION));
EXPECT_CALL(mock_js_event_handler_,
HandleJsEvent("onPassphraseRequired",
@@ -152,11 +152,11 @@ TEST_F(JsSyncManagerObserverTest, OnPassphraseRequired) {
HasDetailsAsDictionary(reason_decryption_details)));
js_sync_manager_observer_.OnPassphraseRequired(
- csync::REASON_PASSPHRASE_NOT_REQUIRED,
+ syncer::REASON_PASSPHRASE_NOT_REQUIRED,
sync_pb::EncryptedData());
- js_sync_manager_observer_.OnPassphraseRequired(csync::REASON_ENCRYPTION,
+ js_sync_manager_observer_.OnPassphraseRequired(syncer::REASON_ENCRYPTION,
sync_pb::EncryptedData());
- js_sync_manager_observer_.OnPassphraseRequired(csync::REASON_DECRYPTION,
+ js_sync_manager_observer_.OnPassphraseRequired(syncer::REASON_DECRYPTION,
sync_pb::EncryptedData());
PumpLoop();
}
@@ -206,4 +206,4 @@ TEST_F(JsSyncManagerObserverTest, OnEncryptedTypesChanged) {
}
} // namespace
-} // namespace csync
+} // namespace syncer
« no previous file with comments | « sync/internal_api/js_sync_manager_observer.cc ('k') | sync/internal_api/public/base_node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698