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

Unified Diff: sync/internal_api/public/engine/model_safe_worker_unittest.cc

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights 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/public/engine/model_safe_worker.cc ('k') | sync/internal_api/public/engine/sync_status.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/public/engine/model_safe_worker_unittest.cc
diff --git a/sync/internal_api/public/engine/model_safe_worker_unittest.cc b/sync/internal_api/public/engine/model_safe_worker_unittest.cc
index a25e0b1133785af6cc2048f665135d64103bb457..b1036b506175f72cf1d830e82c8e14ae0f431b70 100644
--- a/sync/internal_api/public/engine/model_safe_worker_unittest.cc
+++ b/sync/internal_api/public/engine/model_safe_worker_unittest.cc
@@ -16,9 +16,9 @@ class ModelSafeWorkerTest : public ::testing::Test {
TEST_F(ModelSafeWorkerTest, ModelSafeRoutingInfoToValue) {
ModelSafeRoutingInfo routing_info;
- routing_info[syncable::BOOKMARKS] = GROUP_PASSIVE;
- routing_info[syncable::NIGORI] = GROUP_UI;
- routing_info[syncable::PREFERENCES] = GROUP_DB;
+ routing_info[syncer::BOOKMARKS] = GROUP_PASSIVE;
+ routing_info[syncer::NIGORI] = GROUP_UI;
+ routing_info[syncer::PREFERENCES] = GROUP_DB;
DictionaryValue expected_value;
expected_value.SetString("Bookmarks", "GROUP_PASSIVE");
expected_value.SetString("Encryption keys", "GROUP_UI");
@@ -30,9 +30,9 @@ TEST_F(ModelSafeWorkerTest, ModelSafeRoutingInfoToValue) {
TEST_F(ModelSafeWorkerTest, ModelSafeRoutingInfoToString) {
ModelSafeRoutingInfo routing_info;
- routing_info[syncable::BOOKMARKS] = GROUP_PASSIVE;
- routing_info[syncable::NIGORI] = GROUP_UI;
- routing_info[syncable::PREFERENCES] = GROUP_DB;
+ routing_info[syncer::BOOKMARKS] = GROUP_PASSIVE;
+ routing_info[syncer::NIGORI] = GROUP_UI;
+ routing_info[syncer::PREFERENCES] = GROUP_DB;
EXPECT_EQ(
"{\"Bookmarks\":\"GROUP_PASSIVE\",\"Encryption keys\":\"GROUP_UI\","
"\"Preferences\":\"GROUP_DB\"}",
@@ -41,23 +41,23 @@ TEST_F(ModelSafeWorkerTest, ModelSafeRoutingInfoToString) {
TEST_F(ModelSafeWorkerTest, GetRoutingInfoTypes) {
ModelSafeRoutingInfo routing_info;
- routing_info[syncable::BOOKMARKS] = GROUP_PASSIVE;
- routing_info[syncable::NIGORI] = GROUP_UI;
- routing_info[syncable::PREFERENCES] = GROUP_DB;
- const syncable::ModelTypeSet expected_types(
- syncable::BOOKMARKS,
- syncable::NIGORI,
- syncable::PREFERENCES);
+ routing_info[syncer::BOOKMARKS] = GROUP_PASSIVE;
+ routing_info[syncer::NIGORI] = GROUP_UI;
+ routing_info[syncer::PREFERENCES] = GROUP_DB;
+ const syncer::ModelTypeSet expected_types(
+ syncer::BOOKMARKS,
+ syncer::NIGORI,
+ syncer::PREFERENCES);
EXPECT_TRUE(GetRoutingInfoTypes(routing_info).Equals(expected_types));
}
TEST_F(ModelSafeWorkerTest, ModelSafeRoutingInfoToPayloadMap) {
std::string payload = "test";
ModelSafeRoutingInfo routing_info;
- routing_info[syncable::BOOKMARKS] = GROUP_PASSIVE;
- routing_info[syncable::NIGORI] = GROUP_UI;
- routing_info[syncable::PREFERENCES] = GROUP_DB;
- syncable::ModelTypePayloadMap types_with_payloads =
+ routing_info[syncer::BOOKMARKS] = GROUP_PASSIVE;
+ routing_info[syncer::NIGORI] = GROUP_UI;
+ routing_info[syncer::PREFERENCES] = GROUP_DB;
+ syncer::ModelTypePayloadMap types_with_payloads =
ModelSafeRoutingInfoToPayloadMap(routing_info, payload);
ASSERT_EQ(routing_info.size(), types_with_payloads.size());
for (ModelSafeRoutingInfo::iterator iter = routing_info.begin();
« no previous file with comments | « sync/internal_api/public/engine/model_safe_worker.cc ('k') | sync/internal_api/public/engine/sync_status.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698