summaryrefslogtreecommitdiffstats
path: root/sync/engine/apply_updates_command_unittest.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-21 20:48:36 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-21 20:48:36 +0000
commitd78354a5e74c5208dd9ebe83717b22223c1e1272 (patch)
tree4c616bbbfbf1776055d250644e1a47d435b11c8a /sync/engine/apply_updates_command_unittest.cc
parent41fed979ae412d2475a2860ea1ec95531bebb5af (diff)
downloadchromium_src-d78354a5e74c5208dd9ebe83717b22223c1e1272.zip
chromium_src-d78354a5e74c5208dd9ebe83717b22223c1e1272.tar.gz
chromium_src-d78354a5e74c5208dd9ebe83717b22223c1e1272.tar.bz2
[Sync] Rename browser_sync to csync in sync/
Update all references from chrome. Leave possibly-extraneous csync:: qualifications in sync/ for now. (This will be cleaned up once everything in sync/ is in csync::.) BUG=128060 TEST= TBR=jhawkins@chromium.org Review URL: https://chromiumcodereview.appspot.com/10600002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine/apply_updates_command_unittest.cc')
-rw-r--r--sync/engine/apply_updates_command_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sync/engine/apply_updates_command_unittest.cc b/sync/engine/apply_updates_command_unittest.cc
index e60c15f..517e7f2 100644
--- a/sync/engine/apply_updates_command_unittest.cc
+++ b/sync/engine/apply_updates_command_unittest.cc
@@ -25,7 +25,7 @@
#include "sync/util/cryptographer.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace browser_sync {
+namespace csync {
using sessions::SyncSession;
using std::string;
@@ -531,7 +531,7 @@ TEST_F(ApplyUpdatesCommandTest, DecryptablePassword) {
cryptographer = directory()->GetCryptographer(&trans);
}
- browser_sync::KeyParams params = {"localhost", "dummy", "foobar"};
+ csync::KeyParams params = {"localhost", "dummy", "foobar"};
cryptographer->AddKey(params);
sync_pb::EntitySpecifics specifics;
@@ -1005,4 +1005,4 @@ TEST_F(ApplyUpdatesCommandTest, CannotEncryptUnsyncedChanges) {
}
}
-} // namespace browser_sync
+} // namespace csync